diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-05-17 20:27:59 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-05-17 20:28:11 +0200 |
| commit | 9bcdb58c13b7094a79ae2855a5682f29facab51d (patch) | |
| tree | 941d3e452d539d2326b1f18a3820ec3ffb3bf8fd | |
| parent | faa85accc99d6ff777f12f5dd9e43a6dd8f7e7a2 (diff) | |
| download | vyos-1x-9bcdb58c13b7094a79ae2855a5682f29facab51d.tar.gz vyos-1x-9bcdb58c13b7094a79ae2855a5682f29facab51d.zip | |
pppoe: dhcpv6-pd: T421: start/stop delegation with interface status
| -rw-r--r-- | data/templates/pppoe/ip-down.script.tmpl | 5 | ||||
| -rw-r--r-- | data/templates/pppoe/ipv6-up.script.tmpl | 5 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces-pppoe.py | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/data/templates/pppoe/ip-down.script.tmpl b/data/templates/pppoe/ip-down.script.tmpl index a68fc099c..fe8fd7584 100644 --- a/data/templates/pppoe/ip-down.script.tmpl +++ b/data/templates/pppoe/ip-down.script.tmpl @@ -26,3 +26,8 @@ fi # Always delete default route when interface goes down vtysh -c "conf t" ${VRF_NAME} -c "no ip route 0.0.0.0/0 {{ intf }} ${VRF_NAME}" {% endif %} + +{% if dhcpv6_pd %} +# Start wide dhcpv6 client +systemctl stop dhcp6c@{{ intf }}.service +{% endif %} diff --git a/data/templates/pppoe/ipv6-up.script.tmpl b/data/templates/pppoe/ipv6-up.script.tmpl index a4b08ddaf..90873229a 100644 --- a/data/templates/pppoe/ipv6-up.script.tmpl +++ b/data/templates/pppoe/ipv6-up.script.tmpl @@ -39,3 +39,8 @@ echo 2 > /proc/sys/net/ipv6/conf/{{ intf }}/accept_ra # Autoconfigure addresses using Prefix Information in Router Advertisements. echo 1 > /proc/sys/net/ipv6/conf/{{ intf }}/autoconfigure {% endif %} + +{% if dhcpv6_pd %} +# Start wide dhcpv6 client +systemctl start dhcp6c@{{ intf }}.service +{% endif %} diff --git a/src/conf_mode/interfaces-pppoe.py b/src/conf_mode/interfaces-pppoe.py index baa07e283..ab96211ac 100755 --- a/src/conf_mode/interfaces-pppoe.py +++ b/src/conf_mode/interfaces-pppoe.py @@ -195,6 +195,10 @@ def generate(pppoe): config_files = [config_pppoe, script_pppoe_pre_up, script_pppoe_ip_up, script_pppoe_ip_down, script_pppoe_ipv6_up] + # Shutdown DHCPv6 prefix delegation client + if pppoe['dhcpv6_pd']: + cmd(f'systemctl stop dhcp6c@{intf}.service') + # Always hang-up PPPoE connection prior generating new configuration file cmd(f'systemctl stop ppp@{intf}.service') |