From 7a82196d79f6b755db514e002216340223e61de7 Mon Sep 17 00:00:00 2001
From: slioch <slioch@eng-140.vyatta.com>
Date: Fri, 15 May 2009 20:33:44 -0700
Subject: root node support on load merge operation. additional work needed for
 deeper merge path support

---
 scripts/vyatta-load-config.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

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
-- 
cgit v1.2.3