diff options
| author | John Estabrook <jestabro@sentrium.io> | 2019-10-01 11:31:42 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@sentrium.io> | 2019-10-01 11:31:42 -0500 |
| commit | 9e74ad7ef0c043bc7bd1fa14b6708cc11ab3bc5c (patch) | |
| tree | 7fd9e531184d29615876a69726d6a3f6dc924de2 | |
| parent | 710728ee8eb6def82f9a142468960f6985dcf4e8 (diff) | |
| download | vyatta-cfg-9e74ad7ef0c043bc7bd1fa14b6708cc11ab3bc5c.tar.gz vyatta-cfg-9e74ad7ef0c043bc7bd1fa14b6708cc11ab3bc5c.zip | |
T1424: Rewrite the config load script
| -rwxr-xr-x | etc/bash_completion.d/vyatta-cfg | 16 | ||||
| -rw-r--r-- | functions/interpreter/vyatta-cfg-run | 2 | ||||
| -rw-r--r-- | functions/wrapper/script-template | 2 | ||||
| -rwxr-xr-x | scripts/vyatta-cfg-cmd-wrapper | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/etc/bash_completion.d/vyatta-cfg b/etc/bash_completion.d/vyatta-cfg index cf72330..a2c3332 100755 --- a/etc/bash_completion.d/vyatta-cfg +++ b/etc/bash_completion.d/vyatta-cfg @@ -192,14 +192,14 @@ vyatta_loadsave_complete() echo echo "Possible completions:" if [ "$command" = "load" ]; then - echo -e " <Enter>\t\t\t\tLoad from system config file" - echo -e " <file>\t\t\t\tLoad from file on local machine" - echo -e " scp://<user>:<passwd>@<host>/<file>\tLoad from file on remote machine" - echo -e " sftp://<user>:<passwd>@<host>/<file>\tLoad from file on remote machine" - echo -e " ftp://<user>:<passwd>@<host>/<file>\tLoad from file on remote machine" - echo -e " http://<host>/<file>\t\t\tLoad from file on remote machine" - 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" + echo -e " <Enter>\t\t\t\t\tLoad from system config file" + echo -e " <file>\t\t\t\t\tLoad from file on local machine" + echo -e " scp://<user>[:<passwd>]@<host>/<file>\t\tLoad from file on remote machine" + echo -e " sftp://<user>[:<passwd>]@<host>/<file>\tLoad from file on remote machine" + echo -e " http://<host>/<file>\t\t\t\tLoad from file on remote machine" + echo -e " https://<host>/<file>\t\t\t\tLoad from file on remote machine" + echo -e " ftp://<user>[:<passwd>]@<host>/<file>\t\tLoad from file on remote machine" + echo -e " tftp://<host>/<file>\t\t\t\tLoad from file on remote machine" elif [ "$command" = "merge" ]; then 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" diff --git a/functions/interpreter/vyatta-cfg-run b/functions/interpreter/vyatta-cfg-run index a274e24..3ec3d6f 100644 --- a/functions/interpreter/vyatta-cfg-run +++ b/functions/interpreter/vyatta-cfg-run @@ -229,7 +229,7 @@ vyatta_config_load () fi # return to top level. reset_edit_level - ${vyatta_sbindir}/vyatta-load-config.pl "$@" + ${vyos_libexec_dir}/vyos-load-config.py "$@" } vyatta_config_merge () diff --git a/functions/wrapper/script-template b/functions/wrapper/script-template index 51cb2c0..f88f410 100644 --- a/functions/wrapper/script-template +++ b/functions/wrapper/script-template @@ -108,7 +108,7 @@ function load () fi # return to top level. reset_edit_level - ${vyatta_sbindir}/vyatta-load-config.pl "$@" + ${vyos_libexec_dir}/vyos-load-config.py "$@" } function save () diff --git a/scripts/vyatta-cfg-cmd-wrapper b/scripts/vyatta-cfg-cmd-wrapper index 952112f..896f7ed 100755 --- a/scripts/vyatta-cfg-cmd-wrapper +++ b/scripts/vyatta-cfg-cmd-wrapper @@ -81,7 +81,7 @@ case "$1" in exec ${vyatta_sbindir}/vyatta-save-config.pl "${@:2}" ;; load) - exec ${vyatta_sbindir}/vyatta-load-config.pl "${@:2}" + exec ${vyos_libexec_dir}/vyos-load-config.py "${@:2}" ;; rule-rename) # this option is to be used for renaming firewall and nat rules only |