From 3d55cf6a09c4aa7bdbf3b5fa89dbf471f7f58f5a Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Thu, 4 Nov 2010 17:00:44 -0700
Subject: Fix 6404: change load/merge commands to NOT automatically commit.

---
 scripts/vyatta-load-config.pl | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/scripts/vyatta-load-config.pl b/scripts/vyatta-load-config.pl
index 20cf200..e85d802 100755
--- a/scripts/vyatta-load-config.pl
+++ b/scripts/vyatta-load-config.pl
@@ -277,11 +277,7 @@ foreach (@comment_list) {
     #ignore error on complaint re: nested nodes
 }
 
-system("$sbindir/my_commit");
-if ( $? >> 8 ) {
-    print "Load failed (commit failed)\n";
-    exit 1;
-}
-
-print "Done\n";
+my $load_merge = 'Load';
+$load_merge = 'Merge' if $merge_mode eq 'true';
+print "\n$load_merge complete.  Use 'commit' to make changes active.\n";
 exit 0;
-- 
cgit v1.2.3