From 25d68524ca7c9f11d6fa5e0572955377d54d0526 Mon Sep 17 00:00:00 2001
From: Michael Larson <slioch@slioch.vyatta.com>
Date: Wed, 9 Jun 2010 17:10:03 -0700
Subject: fix for bug 5676

---
 lib/Vyatta/ConfigLoad.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/Vyatta/ConfigLoad.pm b/lib/Vyatta/ConfigLoad.pm
index 033aec0..47a27ce 100755
--- a/lib/Vyatta/ConfigLoad.pm
+++ b/lib/Vyatta/ConfigLoad.pm
@@ -102,7 +102,14 @@ sub enumerate_branch {
   }
 
   if (defined($cur_node->{'disable'})) {
-      push @disable_list, join(" ",@cur_path);
+      my $p = join("/",@cur_path[0..$#cur_path-1]);
+      my $leaf = "$ENV{VYATTA_TEMP_CONFIG_DIR}/$p/node.val";
+      if (-e $leaf) {
+	  push @disable_list, join(" ",@cur_path[0..$#cur_path-1]);
+      }
+      else {
+	  push @disable_list, join(" ",@cur_path);
+      }
   }
 
   if ($terminal) {
-- 
cgit v1.2.3