summaryrefslogtreecommitdiff
path: root/scripts/system
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2010-07-28 02:46:39 -0700
committerBob Gilligan <gilligan@vyatta.com>2010-07-28 02:46:39 -0700
commit7c9a042342f6e8d8961391b173655595e25d9ca1 (patch)
tree397c7a18c52c4b27e67f9a7aa0ce855f44ae8980 /scripts/system
parentd3bb616ddd7d97455919dcd49e132f8d271bf38b (diff)
parent67718223cb935df4805fa78dc1e92e4a6f8fc2f4 (diff)
downloadvyatta-cfg-system-7c9a042342f6e8d8961391b173655595e25d9ca1.tar.gz
vyatta-cfg-system-7c9a042342f6e8d8961391b173655595e25d9ca1.zip
Merge branch 'mendocino' of http://git.vyatta.com/vyatta-cfg-system into mendocino
Diffstat (limited to 'scripts/system')
-rwxr-xr-xscripts/system/vyatta_update_resolv.pl1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/system/vyatta_update_resolv.pl b/scripts/system/vyatta_update_resolv.pl
index f39dd3e7..041292be 100755
--- a/scripts/system/vyatta_update_resolv.pl
+++ b/scripts/system/vyatta_update_resolv.pl
@@ -39,7 +39,6 @@ my @domains;
my $domain_name = undef;
if ($dhclient_script == 1) {
- $vc->{_active_dir_base} = "/opt/vyatta/config/active/";
@domains = $vc->returnOrigValues('domain-search domain');
$domain_name = $vc->returnOrigValue('domain-name');
} else {