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 /src/etc/dhcp/dhclient-enter-hooks.d | |
| 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 'src/etc/dhcp/dhclient-enter-hooks.d')
| -rw-r--r-- | src/etc/dhcp/dhclient-enter-hooks.d/04-vyos-resolvconf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/dhcp/dhclient-enter-hooks.d/04-vyos-resolvconf b/src/etc/dhcp/dhclient-enter-hooks.d/04-vyos-resolvconf index b1902b585..518abeaec 100644 --- a/src/etc/dhcp/dhclient-enter-hooks.d/04-vyos-resolvconf +++ b/src/etc/dhcp/dhclient-enter-hooks.d/04-vyos-resolvconf @@ -33,8 +33,8 @@ if /usr/bin/systemctl -q is-active vyos-hostsd; then if [ -n "$new_dhcp6_name_servers" ]; then logmsg info "Deleting nameservers with tag \"dhcpv6-$interface\" via vyos-hostsd-client" $hostsd_client --delete-name-servers --tag "dhcpv6-$interface" - logmsg info "Adding nameservers \"$new_dhcpv6_name_servers\" with tag \"dhcpv6-$interface\" via vyos-hostsd-client" - $hostsd_client --add-name-servers $new_dhcpv6_name_servers --tag "dhcpv6-$interface" + logmsg info "Adding nameservers \"$new_dhcp6_name_servers\" with tag \"dhcpv6-$interface\" via vyos-hostsd-client" + $hostsd_client --add-name-servers $new_dhcp6_name_servers --tag "dhcpv6-$interface" hostsd_changes=y fi |