3 files changed, 5 insertions, 22 deletions
diff --git a/src/conf_mode/dhcp_relay.py b/src/conf_mode/dhcp_relay.py
index 61b494b7e..1b2abed9e 100755
--- a/src/conf_mode/dhcp_relay.py
+++ b/src/conf_mode/dhcp_relay.py
@@ -43,14 +43,13 @@ SERVERS="{{ server | join(' ') }}"
 INTERFACES="{{ interface | join(' ') }}"
 
 # Additional options that are passed to the DHCP relay daemon?
-OPTIONS="-4 {% if port -%} -p {{ port }}{%- endif %} {{ options | join(' ') }}"
+OPTIONS="-4 {{ options | join(' ') }}"
 """
 
 default_config_data = {
     'interface': [],
     'server': [],
     'options': [],
-    'port': '',
     'hop_count': '10',
     'relay_agent_packets': 'forward'
 }
@@ -86,11 +85,6 @@ def get_config():
         size = '-A ' + conf.return_value('max-size')
         relay['options'].append(size)
 
-    # Listen and transmit on port <xy>. This is mostly useful for debugging
-    # purposes. Default is port 67 for DHCPv4/BOOTP, or port 547 for DHCPv6.
-    if conf.exists('port'):
-        relay['port'] = conf.return_value('port')
-
     # Control the handling of incoming DHCPv4 packets which already contain
     # relay agent options. If such a packet does not have giaddr set in its
     # header, the DHCP standard requires that the packet be discarded. However,
diff --git a/src/conf_mode/dhcpv6_relay.py b/src/conf_mode/dhcpv6_relay.py
index 959bf0496..86e3f8265 100755
--- a/src/conf_mode/dhcpv6_relay.py
+++ b/src/conf_mode/dhcpv6_relay.py
@@ -31,13 +31,12 @@ config_tmpl = """
 
 # Defaults for isc-dhcpv6-relay initscript sourced by /etc/init.d/isc-dhcpv6-relay
 
-OPTIONS="-6 -l {{ listen_addr | join('-l ') }} {% if port -%} -p {{ port }}{%- endif %} {{ options | join(' ') }} -u {{ upstream_addr | join('-u ') }}"
+OPTIONS="-6 -l {{ listen_addr | join('-l ') }} {{ options | join(' ') }} -u {{ upstream_addr | join('-u ') }}"
 """
 
 default_config_data = {
     'listen_addr': [],
     'upstream_addr': [],
-    'port': '',
     'options': [],
 }
 
@@ -65,11 +64,6 @@ def get_config():
             server = addr + '%' + intf
             relay['upstream_addr'].append(server)
 
-    # Listen and transmit on port <xy>. This is mostly useful for debugging
-    # purposes. Default is port 67 for DHCPv4/BOOTP, or port 547 for DHCPv6.
-    if conf.exists('listen-port'):
-        relay['port'] = conf.return_value('listen-port')
-
     # Maximum hop count. When forwarding packets, dhcrelay discards packets
     # which have reached a hop count of COUNT. Default is 10. Maximum is 255.
     if conf.exists('max-hop-count'):
diff --git a/src/conf_mode/wireguard.py b/src/conf_mode/wireguard.py
index c6440ad81..3c8ade1db 100755
--- a/src/conf_mode/wireguard.py
+++ b/src/conf_mode/wireguard.py
@@ -295,18 +295,13 @@ def configure_interface(c, intf):
       os.remove(psk_file)
 
 def add_addr(intf, addr):
+  # see https://phabricator.vyos.net/T949
   ret = subprocess.call(['ip a a dev ' + intf + ' ' + addr + ' &>/dev/null'], shell=True)
-  if ret != 0:
-    raise ConfigError('Can\'t set IP ' + addr + ' on ' + intf)
-  else:
-    sl.syslog(sl.LOG_NOTICE, "ip a a dev " + intf + " " + addr)
+  sl.syslog(sl.LOG_NOTICE, "ip a a dev " + intf + " " + addr)
 
 def del_addr(intf, addr):
   ret = subprocess.call(['ip a d dev ' + intf + ' ' + addr + ' &>/dev/null'], shell=True)
-  if ret != 0:
-    raise ConfigError('Can\'t delete IP ' + addr + ' on ' + intf)
-  else:
-    sl.syslog(sl.LOG_NOTICE, "ip a d dev " + intf + " " + addr)
+  sl.syslog(sl.LOG_NOTICE, "ip a d dev " + intf + " " + addr)
 
 if __name__ == '__main__':
   try: