diff options
Diffstat (limited to 'functions')
| -rw-r--r-- | functions/interpreter/vyatta-cfg-run | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/functions/interpreter/vyatta-cfg-run b/functions/interpreter/vyatta-cfg-run index e0bcfaf..a274e24 100644 --- a/functions/interpreter/vyatta-cfg-run +++ b/functions/interpreter/vyatta-cfg-run @@ -236,13 +236,13 @@ vyatta_config_merge () { # don't load if there are uncommitted changes. if vyatta_cli_shell_api sessionChanged; then - echo "Cannot load: configuration modified." - echo "Commit or discard the changes before loading a config file." + echo "Cannot merge: configuration modified." + echo "Commit or discard the changes before merging a config file." return 1 fi # return to top level. reset_edit_level - ${vyatta_sbindir}/vyatta-load-config.pl "$@" --merge + ${vyos_libexec_dir}/vyos-merge-config.py "$@" } top () |