diff options
| author | John Estabrook <jestabro@sentrium.io> | 2019-05-29 12:05:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-29 12:05:57 -0500 |
| commit | ec0d803a673a85e1159305fcab335679b9fad720 (patch) | |
| tree | 8a80d2f279dfd740935f1de541c4ba6588177c11 | |
| parent | 80131eb407ca8efbbc72da240c904ec1c5d52fb7 (diff) | |
| parent | 8c18c433b1fe85c3e5f246744474ab3d5cb59823 (diff) | |
| download | vyatta-cfg-ec0d803a673a85e1159305fcab335679b9fad720.tar.gz vyatta-cfg-ec0d803a673a85e1159305fcab335679b9fad720.zip | |
Merge pull request #17 from jestabro/merge-config
T1397: Rewrite the config merge script
| -rwxr-xr-x | etc/bash_completion.d/vyatta-cfg | 14 | ||||
| -rw-r--r-- | functions/interpreter/vyatta-cfg-run | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/etc/bash_completion.d/vyatta-cfg b/etc/bash_completion.d/vyatta-cfg index 7e37e74..cf72330 100755 --- a/etc/bash_completion.d/vyatta-cfg +++ b/etc/bash_completion.d/vyatta-cfg @@ -201,13 +201,13 @@ vyatta_loadsave_complete() echo -e " https://<host>/<file>\t\t\tLoad from file on remote machine" echo -e " tftp://<host>/<file>\t\t\tLoad from file on remote machine" elif [ "$command" = "merge" ]; then - echo -e " <Enter>\t\t\t\tMerge from system config file" - echo -e " <file>\t\t\t\tMerge from file on local machine" - echo -e " scp://<user>:<passwd>@<host>/<file>\tMerge from file on remote machine" - echo -e " sftp://<user>:<passwd>@<host>/<file>\tMerge from file on remote machine" - echo -e " ftp://<user>:<passwd>@<host>/<file>\tMerge from file on remote machine" - echo -e " http://<host>/<file>\t\t\tMerge from file on remote machine" - echo -e " tftp://<host>/<file>\t\t\tMerge from file on remote machine" + echo -e " <file>\t\t\t\t\tMerge from file on local machine" + echo -e " scp://<user>[:<passwd>]@<host>/<file>\t\tMerge from file on remote machine" + echo -e " sftp://<user>[:<passwd>]@<host>/<file>\tMerge from file on remote machine" + echo -e " http://<host>/<file>\t\t\t\tMerge from file on remote machine" + echo -e " https://<host>/<file>\t\t\t\tMerge from file on remote machine" + echo -e " ftp://<user>[:<passwd>]@<host>/<file>\t\tMerge from file on remote machine" + echo -e " tftp://<host>/<file>\t\t\t\tMerge from file on remote machine" elif [ "$command" = "save" ]; then echo -e " <Enter>\t\t\t\tSave to system config file" echo -e " <file>\t\t\t\tSave to file on local machine" 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 () |