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

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

(limited to 'lib')

diff --git a/lib/Vyatta/ConfigLoad.pm b/lib/Vyatta/ConfigLoad.pm
index 47a27ce..033aec0 100755
--- a/lib/Vyatta/ConfigLoad.pm
+++ b/lib/Vyatta/ConfigLoad.pm
@@ -102,14 +102,7 @@ sub enumerate_branch {
   }
 
   if (defined($cur_node->{'disable'})) {
-      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);
-      }
+      push @disable_list, join(" ",@cur_path);
   }
 
   if ($terminal) {
-- 
cgit v1.2.3