diff options
| author | Daniil Baturin <daniil@baturin.org> | 2015-02-25 17:26:44 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2015-02-25 17:26:44 +0100 |
| commit | 1c557a64e7506f2cfec0e296cf0e2a6d219c1b84 (patch) | |
| tree | 9dadd65ed6d71ce955dea4d0e6d68c08750d35df | |
| parent | 0d7cbc712f8bac5a85481ba553eba6489649838f (diff) | |
| parent | c546dd3ad5c15c42494d9fddf60704043985fe48 (diff) | |
| download | vyatta-cfg-system-1c557a64e7506f2cfec0e296cf0e2a6d219c1b84.tar.gz vyatta-cfg-system-1c557a64e7506f2cfec0e296cf0e2a6d219c1b84.zip | |
Merge branch 'helium' of github.com:vyos/vyatta-cfg-system into helium
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rwxr-xr-x | scripts/system/vyatta_update_resolv.pl | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 671002a4..c67edc8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +vyatta-cfg-system (0.20.43+vyos1+helium27) unstable; urgency=low + + [ Alex Harpin ] + * vyatta-cfg-system: multiple servers for dns forwarding domain override + * Revert "vyatta-cfg-system: multiple servers for dns forwarding domain override" + * vyatta-cfg-system: invalid resolv.conf format causing extra DNS request + + -- Alex Harpin <development@landsofshadow.co.uk> Wed, 25 Feb 2015 07:21:38 +0000 + vyatta-cfg-system (0.20.43+vyos1+helium26) unstable; urgency=low * Bug #490: use command line options for parameters-only and temporary diff --git a/scripts/system/vyatta_update_resolv.pl b/scripts/system/vyatta_update_resolv.pl index 921052f0..93e6041d 100755 --- a/scripts/system/vyatta_update_resolv.pl +++ b/scripts/system/vyatta_update_resolv.pl @@ -96,12 +96,12 @@ if (!defined($domain_name)) { my $search = ''; if (length($doms) > 0) { - $search = "search\t\t$doms\t\t#line generated by $0\n"; + $search = "#line generated by $0\nsearch\t\t$doms\n"; } my $domain = ''; if ($domain_name && length($domain_name) > 0) { - $domain = "domain\t\t$domain_name\t\t#line generated by $0\n"; + $domain = "#line generated by $0\ndomain\t\t$domain_name\n"; } # update /etc/resolv.conf with name-servers received from dhcp client, done when this script is called @@ -221,7 +221,7 @@ foreach my $line (@resolv) { if (length($domain) > 0) { print $r $domain; } - } else { + } elsif ($line !~ /^#line generated by\s/) { print $r $line; } } |