[syslog/hostname.py] T1394 - syslog systemd and host_name.py race condition

  - checking if the hostname has changed, otherwise the script and systemd try to restart
    rsyslogd at the same time, at the end it's not started at all.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py
index 621ccd7e0..0d03fd41c 100755
--- a/src/conf_mode/host_name.py
+++ b/src/conf_mode/host_name.py
@@ -248,10 +248,15 @@ def apply(config):
     if config['domain_name']:
         fqdn += '.' + config['domain_name']
 
+    # rsyslog runs into a race condition at boot time with systemd
+    # restart rsyslog only if the hostname changed.
+    hn = subprocess.check_output(['hostnamectl','--static']).decode().strip()
+
     os.system("hostnamectl set-hostname --static {0}".format(fqdn.rstrip('.')))
 
     # Restart services that use the hostname
-    os.system("systemctl restart rsyslog.service")
+    if hn != fqdn:
+      os.system("systemctl restart rsyslog.service")
 
     # If SNMP is running, restart it too
     if os.system("pgrep snmpd > /dev/null") == 0: