summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xlib/Vyatta/ConfigLoad.pm9
1 files changed, 8 insertions, 1 deletions
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) {