diff options
| author | Michael Larson <slioch@slioch.vyatta.com> | 2010-06-09 17:10:03 -0700 |
|---|---|---|
| committer | Michael Larson <slioch@slioch.vyatta.com> | 2010-06-09 17:10:03 -0700 |
| commit | 25d68524ca7c9f11d6fa5e0572955377d54d0526 (patch) | |
| tree | 65f167637a6f02f31f110ee61ab9b24404000283 /lib/Vyatta/ConfigLoad.pm | |
| parent | 7689250849e5e807cd9b60111d4d3d82d461975e (diff) | |
| download | vyatta-cfg-25d68524ca7c9f11d6fa5e0572955377d54d0526.tar.gz vyatta-cfg-25d68524ca7c9f11d6fa5e0572955377d54d0526.zip | |
fix for bug 5676
Diffstat (limited to 'lib/Vyatta/ConfigLoad.pm')
| -rwxr-xr-x | lib/Vyatta/ConfigLoad.pm | 9 |
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) { |