From 2754e3a6792eae084067be002c2ecc47a9de0b3e Mon Sep 17 00:00:00 2001 From: Alex Harpin Date: Tue, 9 Sep 2014 23:24:42 +0100 Subject: vyatta-cfg-system: add 'set system allow-dhcp-nameservers' option Instead of simply allowing / denying DHCP related updates to resolv.conf based on the current values of 'set system name-server', as initially proposed for Bug #182 (http://bugzilla.vyos.net/show_bug.cgi?id=182), this patch replaces that behaviour with a global option to allow / deny these updates. Add 'set system allow-dhcp-nameservers' as a boolean value that has the default value of true, so allowing DHCP nameserver updates by default. Bug #308 http://bugzilla.vyos.net/show_bug.cgi?id=308 --- scripts/system/vyatta_update_resolv.pl | 4 ++-- templates/system/allow-dhcp-nameservers/node.def | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 templates/system/allow-dhcp-nameservers/node.def diff --git a/scripts/system/vyatta_update_resolv.pl b/scripts/system/vyatta_update_resolv.pl index 6a60278b..ee14034b 100755 --- a/scripts/system/vyatta_update_resolv.pl +++ b/scripts/system/vyatta_update_resolv.pl @@ -94,8 +94,8 @@ if ($domain_name && length($domain_name) > 0) { } # update /etc/resolv.conf for name-servers received from dhcp client, only done when dhclient-script calls this script -# and there aren't statically configured DNS settings, via 'set system name-server', in place. -if (($dhclient_script == 1) && !($vc->existsOrig('name-server'))) { +# and allow-dhcp-nameservers is set to true (default) +if (($dhclient_script == 1) && ($vc->returnOrigValue('allow-dhcp-nameservers') eq "true")) { my @current_dhcp_nameservers; my $restart_ntp = 0; diff --git a/templates/system/allow-dhcp-nameservers/node.def b/templates/system/allow-dhcp-nameservers/node.def new file mode 100644 index 00000000..c010baf1 --- /dev/null +++ b/templates/system/allow-dhcp-nameservers/node.def @@ -0,0 +1,4 @@ +priority: 300 +type: bool +help: Allow DHCP to update DNS settings +default: true -- cgit v1.2.3