summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/vyatta-load-config.pl12
1 files changed, 11 insertions, 1 deletions
diff --git a/scripts/vyatta-load-config.pl b/scripts/vyatta-load-config.pl
index 9284cba..b73216a 100755
--- a/scripts/vyatta-load-config.pl
+++ b/scripts/vyatta-load-config.pl
@@ -230,7 +230,17 @@ foreach (@activate_list) {
}
foreach (@deactivate_list) {
- my $cmd = "$sbindir/vyatta-activate-config.pl deactivate $_";
+ my @cp = split(" ",$_);
+ my $p = join("/",@cp[0..$#cp-1]);
+ my $leaf = "$ENV{VYATTA_TEMP_CONFIG_DIR}/$p/node.val";
+ my $c = "";
+ if (-e $leaf) {
+ $c = join(" ",@cp[0..$#cp-1]);
+ }
+ else {
+ $c = join(" ",@cp);
+ }
+ my $cmd = "$sbindir/vyatta-activate-config.pl deactivate $c";
system("$cmd 1>/dev/null");
#ignore error on complaint re: nested nodes
}