diff options
| author | Jernej Jakob <jernej.jakob@gmail.com> | 2020-05-11 17:58:28 +0200 |
|---|---|---|
| committer | Jernej Jakob <jernej.jakob@gmail.com> | 2020-05-11 17:58:28 +0200 |
| commit | 49fc2c83adfa2c5dc169cae675f65c8e36a7d6c4 (patch) | |
| tree | 7ace538f7568a8005f0e4f0987b27f0fd8dde20b | |
| parent | a7fe78a0d35b2cf5e65fc4fba4ed94c5ef9d3980 (diff) | |
| download | vyos-1x-49fc2c83adfa2c5dc169cae675f65c8e36a7d6c4.tar.gz vyos-1x-49fc2c83adfa2c5dc169cae675f65c8e36a7d6c4.zip | |
ifconfig/dhcp: T2449: remove accept_ra logic as it was wrong
Currently accept_ra was set to 0 if 'address dhcpv6' was set on an
interface. This is wrong, as without RA, the system will get no routes
to the DHCPv6-obtained prefix.
Since the logic for accept_ra was moved to the interface scripts,
it can be removed from the dhclient code.
| -rw-r--r-- | python/vyos/ifconfig/dhcp.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/python/vyos/ifconfig/dhcp.py b/python/vyos/ifconfig/dhcp.py index bf6566c07..57e488cc7 100644 --- a/python/vyos/ifconfig/dhcp.py +++ b/python/vyos/ifconfig/dhcp.py @@ -114,9 +114,6 @@ class _DHCPv6 (Control): render(self.options['options_file'], 'dhcp-client/daemon-options.tmpl', self.options) render(self.options['conf_file'], 'dhcp-client/ipv6.tmpl', self.options) - # no longer accept router announcements on this interface - self._write_sysfs('/proc/sys/net/ipv6/conf/{ifname}/accept_ra'.format(**self.options), 0) - return self._cmd('systemctl restart dhclient6@{ifname}.service'.format(**self.options)) def delete(self): @@ -136,9 +133,6 @@ class _DHCPv6 (Control): self._cmd('systemctl stop dhclient6@{ifname}.service'.format(**self.options)) - # accept router announcements on this interface - self._write_sysfs('/proc/sys/net/ipv6/conf/{ifname}/accept_ra'.format(**self.options), 1) - # cleanup old config files for name in ('conf_file', 'options_file', 'pid_file', 'lease_file'): if os.path.isfile(self.options[name]): |