diff options
| author | Yuxiang Zhu <vfreex@gmail.com> | 2022-11-14 10:23:46 +0800 |
|---|---|---|
| committer | Yuxiang Zhu <vfreex@gmail.com> | 2022-11-15 13:56:56 +0800 |
| commit | ff901a52bb9acd4bdd0e3a96033c896e4667a6af (patch) | |
| tree | 050292e6ba92248a02948c430ec5da778e90833d /data/templates/pppoe | |
| parent | b3e524c29e9f5c8e7536ba86de9097be70fe5fb6 (diff) | |
| download | vyos-1x-ff901a52bb9acd4bdd0e3a96033c896e4667a6af.tar.gz vyos-1x-ff901a52bb9acd4bdd0e3a96033c896e4667a6af.zip | |
backport: T4815: Fix various name server config issues
This is a backport of https://github.com/vyos/vyos-1x/pull/1656.
Note I also changed `ip-down.script.tmpl` to not wait for `systemctl
stop dhcp6c@$iface.service`, because that command is slow and pppd will
kill the ip-down script if it times out.
I didn't see `ip-down.script.tmpl` or its equivalent in the 1.4 branch.
Not sure if there is another mechanism to handle that functionality or
it is missed.
Diffstat (limited to 'data/templates/pppoe')
| -rw-r--r-- | data/templates/pppoe/ip-down.script.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/pppoe/ip-down.script.tmpl b/data/templates/pppoe/ip-down.script.tmpl index bac4155d6..c1d1132b3 100644 --- a/data/templates/pppoe/ip-down.script.tmpl +++ b/data/templates/pppoe/ip-down.script.tmpl @@ -33,6 +33,6 @@ vtysh -c "conf t" ${VRF_NAME} -c "no ipv6 route ::/0 {{ ifname }} ${VRF_NAME}" {% endif %} {% if dhcpv6_options is defined and dhcpv6_options.pd is defined %} -# Stop wide dhcpv6 client -systemctl stop dhcp6c@{{ ifname }}.service +# Stop wide dhcpv6 client without blocking (by default the ip-down script can only run up to 5 seconds) +systemctl stop --no-block dhcp6c@{{ ifname }}.service {% endif %} |