diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2010-11-04 17:00:44 -0700 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2010-11-04 17:00:44 -0700 |
| commit | 3d55cf6a09c4aa7bdbf3b5fa89dbf471f7f58f5a (patch) | |
| tree | ed71c17c10207f753c113eecab84070d4a986c5b | |
| parent | 404fc4b837f1889799ca692bf3b95993c071e3bd (diff) | |
| download | vyatta-cfg-3d55cf6a09c4aa7bdbf3b5fa89dbf471f7f58f5a.tar.gz vyatta-cfg-3d55cf6a09c4aa7bdbf3b5fa89dbf471f7f58f5a.zip | |
Fix 6404: change load/merge commands to NOT automatically commit.
| -rwxr-xr-x | scripts/vyatta-load-config.pl | 10 |
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; |