diff options
| author | slioch <slioch@eng-140.vyatta.com> | 2009-05-15 20:33:44 -0700 |
|---|---|---|
| committer | slioch <slioch@eng-140.vyatta.com> | 2009-05-15 20:33:44 -0700 |
| commit | 7a82196d79f6b755db514e002216340223e61de7 (patch) | |
| tree | 660fcc052fb5bb2e479089eb65c8b9501f6f06e5 /scripts/vyatta-load-config.pl | |
| parent | deb86bf2b27631f66e5ffd849ba45db895dbd091 (diff) | |
| download | vyatta-cfg-7a82196d79f6b755db514e002216340223e61de7.tar.gz vyatta-cfg-7a82196d79f6b755db514e002216340223e61de7.zip | |
root node support on load merge operation. additional work needed for deeper merge path support
Diffstat (limited to 'scripts/vyatta-load-config.pl')
| -rwxr-xr-x | scripts/vyatta-load-config.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/vyatta-load-config.pl b/scripts/vyatta-load-config.pl index 4073905..6755015 100755 --- a/scripts/vyatta-load-config.pl +++ b/scripts/vyatta-load-config.pl @@ -163,7 +163,7 @@ syslog( "warning", "Load config [$orig_load_file] by $login" ); system("$sbindir/vyatta_config_migrate.pl $load_file"); print "Loading config file $load_file...\n"; -my %cfg_hier = Vyatta::ConfigLoad::loadConfigHierarchy($load_file); +my %cfg_hier = Vyatta::ConfigLoad::loadConfigHierarchy($load_file,$merge); if ( scalar( keys %cfg_hier ) == 0 ) { print "The specified file does not contain any configuration.\n"; print |