diff options
| author | Michael Larson <slioch@slioch.vyatta.com> | 2010-06-09 17:43:41 -0700 |
|---|---|---|
| committer | Michael Larson <slioch@slioch.vyatta.com> | 2010-06-09 17:43:41 -0700 |
| commit | e28eb1f16c05f71f91fa56ae7120cc95b104910a (patch) | |
| tree | 9f3f69134b5dda3499f5a76143e1231b31a79b4f /lib/Vyatta/ConfigLoad.pm | |
| parent | 8a5d10199a35fe7e796c3d7424bc8f882e6aba24 (diff) | |
| download | vyatta-cfg-e28eb1f16c05f71f91fa56ae7120cc95b104910a.tar.gz vyatta-cfg-e28eb1f16c05f71f91fa56ae7120cc95b104910a.zip | |
better location for previous fix to bug 5676
Diffstat (limited to 'lib/Vyatta/ConfigLoad.pm')
| -rwxr-xr-x | lib/Vyatta/ConfigLoad.pm | 9 |
1 files changed, 1 insertions, 8 deletions
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) { |