diff options
| author | John Estabrook <jestabro@sentrium.io> | 2019-05-22 11:51:26 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@sentrium.io> | 2019-05-28 14:42:28 -0500 |
| commit | 8c18c433b1fe85c3e5f246744474ab3d5cb59823 (patch) | |
| tree | 8a80d2f279dfd740935f1de541c4ba6588177c11 /functions | |
| parent | 80131eb407ca8efbbc72da240c904ec1c5d52fb7 (diff) | |
| download | vyatta-cfg-8c18c433b1fe85c3e5f246744474ab3d5cb59823.tar.gz vyatta-cfg-8c18c433b1fe85c3e5f246744474ab3d5cb59823.zip | |
T1397: Rewrite the config merge script
Add support for the config merge script in vyos-1x.
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 () |