diff options
| author | John Estabrook <jestabro@vyos.io> | 2022-03-08 11:51:31 -0600 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2022-03-08 11:51:31 -0600 |
| commit | 18e2864769226e39479cf3fc3be2dc5ec67acac1 (patch) | |
| tree | 8fda43cc032054525ea1700590dd5c55b1627c8e | |
| parent | 44fa733c7a4948208b003d828cf0ca8c6227cca2 (diff) | |
| download | vyatta-cfg-18e2864769226e39479cf3fc3be2dc5ec67acac1.tar.gz vyatta-cfg-18e2864769226e39479cf3fc3be2dc5ec67acac1.zip | |
save-config: T4292: use vyos-save-config.py
| -rw-r--r-- | Makefile.am | 1 | ||||
| -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, 3 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 00813cd..b5ce47c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -121,7 +121,6 @@ src_my_cli_shell_api_SOURCES = src/cli_shell_api.cpp sbin_SCRIPTS = scripts/vyatta-cfg-cmd-wrapper sbin_SCRIPTS += scripts/vyatta-validate-type.pl sbin_SCRIPTS += scripts/priority.pl -sbin_SCRIPTS += scripts/vyatta-save-config.pl sbin_SCRIPTS += scripts/vyatta-cfg-notify sbin_SCRIPTS += scripts/vyatta-check-typeless-node.pl sbin_SCRIPTS += scripts/vyatta-log-commit.pl diff --git a/functions/interpreter/vyatta-cfg-run b/functions/interpreter/vyatta-cfg-run index 5e0ce42..5696b41 100644 --- a/functions/interpreter/vyatta-cfg-run +++ b/functions/interpreter/vyatta-cfg-run @@ -186,7 +186,7 @@ vyatta_config_save () reset_edit_level # transform individual args into quoted strings local arg='' - local save_cmd="${vyatta_sbindir}/vyatta-save-config.pl" + local save_cmd="${vyos_libexec_dir}/vyos-save-config.py" for arg in "$@"; do save_cmd+=" '$arg'" done diff --git a/functions/wrapper/script-template b/functions/wrapper/script-template index f88f410..4318fe5 100644 --- a/functions/wrapper/script-template +++ b/functions/wrapper/script-template @@ -124,7 +124,7 @@ function save () reset_edit_level # transform individual args into quoted strings local arg='' - local save_cmd="${vyatta_sbindir}/vyatta-save-config.pl" + local save_cmd="${vyos_libexec_dir}/vyos-save-config.py" for arg in "$@"; do save_cmd+=" '$arg'" done diff --git a/scripts/vyatta-cfg-cmd-wrapper b/scripts/vyatta-cfg-cmd-wrapper index 896f7ed..b559e3b 100755 --- a/scripts/vyatta-cfg-cmd-wrapper +++ b/scripts/vyatta-cfg-cmd-wrapper @@ -78,7 +78,7 @@ case "$1" in exec ${vyatta_sbindir}/my_commit ;; save) - exec ${vyatta_sbindir}/vyatta-save-config.pl "${@:2}" + exec ${vyos_libexec_dir}/vyos-save-config.py "${@:2}" ;; load) exec ${vyos_libexec_dir}/vyos-load-config.py "${@:2}" |