diff options
| author | Daniil Baturin <daniil@baturin.org> | 2014-03-24 04:17:05 -0700 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2014-03-24 04:17:05 -0700 |
| commit | 3b64999fe118407c4645406e3264d70ae7c08d94 (patch) | |
| tree | 7dc750960c5a5f6a791d58571a0920235737a8b0 /scripts | |
| parent | df793cfe0ffe587c1a24c50e24eca0acba2574d3 (diff) | |
| parent | 628dc6cd7b92f182cc5252a5e6f60a0bf18d94da (diff) | |
| download | vyatta-cfg-system-3b64999fe118407c4645406e3264d70ae7c08d94.tar.gz vyatta-cfg-system-3b64999fe118407c4645406e3264d70ae7c08d94.zip | |
Merge pull request #7 from tea2ka/helium
Correction of a "DHCPv6Client"-related script for use with parameters only SLAAC
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/system/vyatta_update_resolv.pl | 3 | ||||
| -rwxr-xr-x | scripts/vyatta-dhcpv6-client.pl | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/system/vyatta_update_resolv.pl b/scripts/system/vyatta_update_resolv.pl index 70127512..b311bff5 100755 --- a/scripts/system/vyatta_update_resolv.pl +++ b/scripts/system/vyatta_update_resolv.pl @@ -130,7 +130,8 @@ if ($dhclient_script == 1) { if ($ns_in_resolvconf == 0) { open (my $rf, '>>', '/etc/resolv.conf') or die "$! error trying to overwrite"; - print $rf "nameserver\t$ns\t\t#nameserver written by $0\n"; + print $rf "#nameserver\t$ns\t\t#nameserver written by $0\n"; + print $rf "nameserver\t$ns\n"; close $rf; $restart_ntp = 1; } diff --git a/scripts/vyatta-dhcpv6-client.pl b/scripts/vyatta-dhcpv6-client.pl index 18fbfbd8..3a86f9ba 100755 --- a/scripts/vyatta-dhcpv6-client.pl +++ b/scripts/vyatta-dhcpv6-client.pl @@ -73,10 +73,10 @@ sub dhcpv6_options { my $args = ""; $args .= " -T" - if ($config->exists("dhcpv6-options/temporary")); + if ($config->exists("dhcpv6-options temporary")); $args .= " -S" - if ($config->exists("dhcpv6-options/parameters-only")); + if ($config->exists("dhcpv6-options parameters-only")); return $args; } |