Merge branch 'current' of https://github.com/vyos/vyos-1x into current

2 files changed, 16 insertions, 13 deletions

diff --git a/src/conf_mode/accel_pppoe.py b/src/conf_mode/accel_pppoe.py
index 7a9878a1d..9d2efb0bc 100755
--- a/src/conf_mode/accel_pppoe.py
+++ b/src/conf_mode/accel_pppoe.py
@@ -83,17 +83,19 @@ master=1
 [client-ip-range]
 disable
 
+{% if ppp_gw %}
 [ip-pool]
 gw-ip-address={{ppp_gw}}
 {% if client_ip_pool %}
 {{client_ip_pool}}
-{% endif %}
+{% endif -%}
 
 {% if client_ip_subnets %}
 {% for sn in client_ip_subnets %}
 {{sn}}
 {% endfor %}
 {% endif %}
+{% endif -%}
 
 {% if client_ipv6_pool %}
 [ipv6-pool]
@@ -550,18 +552,14 @@ def verify(c):
       if c['authentication']['radiussrv'][rsrv]['secret'] == None:
         raise ConfigError('radius server ' + rsrv + ' needs a secret configured')
 
-  ### local ippool and gateway settings
-
-  if not c['ppp_gw']:
-    raise ConfigError('pppoe-server local-ip required')
-
-  if not c['client_ip_subnets'] and not c['client_ip_pool']:
-    print ("Warning: No pppoe client IP pool defined") 
+  ### local ippool and gateway settings config checks
 
-  ### activate as soon as it is clear what to do migrate or depricate. 
-  #if c['client_ip_pool']:
-  #  print ("Warning: client-ip-pool (start|stop) is depricated, please use client-ip-pool subnet")
-  #  sl.syslog(sl.LOG_NOTICE, "client-ip-pool start stop is depricated, please use client-ip-pool subnet")
+  if c['client_ip_subnets'] or c['client_ip_pool']:
+    if not c['ppp_gw']:
+      raise ConfigError('pppoe-server local-ip required')
+      
+  if c['ppp_gw'] and not c['client_ip_subnets'] and not c['client_ip_pool']:
+    print ("Warning: No pppoe client IPv4 pool defined") 
 
 def generate(c):
   if c == None:
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: