diff options
| author | Daniil Baturin <daniil@baturin.org> | 2014-09-10 05:58:25 +0700 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2014-09-10 05:58:25 +0700 |
| commit | cffeb5c8d05a996049e487a75f06b4cdd68b23ae (patch) | |
| tree | 6435279bdb1cc00e923667fc87f1173d6b3a52cf | |
| parent | b80cc96f1c13b3da4377209a5143d3c5d39f3182 (diff) | |
| parent | abe35d623c4fa5867ef132174e92e818b3c79fb1 (diff) | |
| download | vyatta-cfg-system-cffeb5c8d05a996049e487a75f06b4cdd68b23ae.tar.gz vyatta-cfg-system-cffeb5c8d05a996049e487a75f06b4cdd68b23ae.zip | |
Merge pull request #23 from cyclops8456/helium
vyatta-cfg-system: add 'set system allow-dhcp-nameservers' option
| -rwxr-xr-x | scripts/system/vyatta_update_resolv.pl | 4 | ||||
| -rw-r--r-- | templates/system/allow-dhcp-nameservers/node.def | 4 |
2 files changed, 6 insertions, 2 deletions
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 |