summaryrefslogtreecommitdiff
path: root/scripts/vyatta-load-config.pl
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/vyatta-load-config.pl')
-rwxr-xr-xscripts/vyatta-load-config.pl10
1 files 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;