diff options
| author | Michael Larson <slioch@slioch.vyatta.com> | 2010-05-21 10:19:01 -0700 |
|---|---|---|
| committer | Michael Larson <slioch@slioch.vyatta.com> | 2010-05-21 10:19:01 -0700 |
| commit | 755f0d7a791c7d80ebd4017aa1e853ee0614cd29 (patch) | |
| tree | cb881d491a2e0adcba19edb0b08123215b6d27f3 /scripts/vyatta-load-config.pl | |
| parent | e11c320caa96d58396eddd91052a0c58a67bb69e (diff) | |
| download | vyatta-cfg-755f0d7a791c7d80ebd4017aa1e853ee0614cd29.tar.gz vyatta-cfg-755f0d7a791c7d80ebd4017aa1e853ee0614cd29.zip | |
fix for disable nodes loading (bug 5610). Additional checks added on configuration of disable nodes. requires vyatta-config-migrate package as well.
Additional fix required for loading configuration with deactivated nodes that are activated through the loading process.
Diffstat (limited to 'scripts/vyatta-load-config.pl')
| -rwxr-xr-x | scripts/vyatta-load-config.pl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/vyatta-load-config.pl b/scripts/vyatta-load-config.pl index 62d6e8b..296dc0d 100755 --- a/scripts/vyatta-load-config.pl +++ b/scripts/vyatta-load-config.pl @@ -220,10 +220,9 @@ foreach (@set_list) { } foreach (@deactivate_list) { - my ( $cmd_ref, $rank ) = @{$_}; - my @cmd = ( "$sbindir/vyatta-activate-config.pl deactivate", @{$cmd_ref} ); - my $cmd_str = join ' ', @cmd; - system("$cmd_str 1>/dev/null"); + #need to remove .disable nodes recursively in tree through activate command + my $cmd = "$sbindir/vyatta-activate-config.pl deactivate $_"; + system("$cmd 1>/dev/null"); #ignore error on complaint re: nested nodes } |