summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-11-15 14:12:09 +0100
committerGitHub <noreply@github.com>2022-11-15 14:12:09 +0100
commit6d90375db4dd0c9beb2815e8ceae2d6214465f99 (patch)
tree050292e6ba92248a02948c430ec5da778e90833d /data
parentb3e524c29e9f5c8e7536ba86de9097be70fe5fb6 (diff)
parentff901a52bb9acd4bdd0e3a96033c896e4667a6af (diff)
downloadvyos-1x-6d90375db4dd0c9beb2815e8ceae2d6214465f99.tar.gz
vyos-1x-6d90375db4dd0c9beb2815e8ceae2d6214465f99.zip
Merge pull request #1659 from vfreex/fix-ns-config-equuleus
backport: T4815: Fix various name server config issues
Diffstat (limited to 'data')
-rw-r--r--data/templates/pppoe/ip-down.script.tmpl4
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 %}