diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-04-01 16:38:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-01 16:38:08 +0200 |
| commit | adb89e77eb8014b9245ee1f7419e84984f6854c6 (patch) | |
| tree | 4870c244a68cd2b4755f6521a46abbdc32c0f464 /src | |
| parent | 5e5bb5a40cbd3fad92f0d88c36f47b9b5fd41347 (diff) | |
| parent | 4e37494b9cb15f3c85b876de700babbaf1b38215 (diff) | |
| download | vyos-1x-adb89e77eb8014b9245ee1f7419e84984f6854c6.tar.gz vyos-1x-adb89e77eb8014b9245ee1f7419e84984f6854c6.zip | |
Merge pull request #3226 from vyos/mergify/bp/sagitta/pr-3224
dhcpv6-client: T2590: fix vyos-hostsd update for nameserver and search domains (backport #3224)
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/dhcp/dhclient-enter-hooks.d/04-vyos-resolvconf | 16 |
1 files changed, 0 insertions, 16 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 518abeaec..9a8a53bfd 100644 --- a/src/etc/dhcp/dhclient-enter-hooks.d/04-vyos-resolvconf +++ b/src/etc/dhcp/dhclient-enter-hooks.d/04-vyos-resolvconf @@ -14,14 +14,6 @@ if /usr/bin/systemctl -q is-active vyos-hostsd; then hostsd_changes=y fi - if [ -n "$new_dhcp6_domain_search" ]; then - logmsg info "Deleting search domains with tag \"dhcpv6-$interface\" via vyos-hostsd-client" - $hostsd_client --delete-search-domains --tag "dhcpv6-$interface" - logmsg info "Adding search domain \"$new_dhcp6_domain_search\" with tag \"dhcpv6-$interface\" via vyos-hostsd-client" - $hostsd_client --add-search-domains "$new_dhcp6_domain_search" --tag "dhcpv6-$interface" - hostsd_changes=y - fi - if [ -n "$new_domain_name_servers" ]; then logmsg info "Deleting nameservers with tag \"dhcp-$interface\" via vyos-hostsd-client" $hostsd_client --delete-name-servers --tag "dhcp-$interface" @@ -30,14 +22,6 @@ if /usr/bin/systemctl -q is-active vyos-hostsd; then hostsd_changes=y fi - 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_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 - if [ $hostsd_changes ]; then logmsg info "Applying changes via vyos-hostsd-client" $hostsd_client --apply |