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

1 files changed, 1 insertions, 7 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,