From e28eb1f16c05f71f91fa56ae7120cc95b104910a Mon Sep 17 00:00:00 2001
From: Michael Larson <slioch@slioch.vyatta.com>
Date: Wed, 9 Jun 2010 17:43:41 -0700
Subject: better location for previous fix to bug 5676

---
 scripts/vyatta-load-config.pl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'scripts')

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
 }
-- 
cgit v1.2.3