diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-08-24 13:50:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-24 13:50:22 -0500 |
| commit | f86d305d2cd638e70e64ef912d826aa1c448c29b (patch) | |
| tree | 51972789ec0faaedcf94ca6597499cc041f92d90 | |
| parent | 7321669f9cb118f2dc366e35843b801cca310feb (diff) | |
| parent | f56f01300512a3083d444d19fbba8323fbce540f (diff) | |
| download | vyatta-cfg-f86d305d2cd638e70e64ef912d826aa1c448c29b.tar.gz vyatta-cfg-f86d305d2cd638e70e64ef912d826aa1c448c29b.zip | |
Merge pull request #67 from jestabro/save-config
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 4434303..c175d7d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,7 +96,6 @@ src_my_cli_shell_api_SOURCES = src/cli_shell_api.cpp sbin_SCRIPTS = scripts/vyatta-cfg-cmd-wrapper sbin_SCRIPTS += scripts/priority.pl -sbin_SCRIPTS += scripts/vyatta-save-config.pl sbin_SCRIPTS += scripts/vyatta-cfg-notify sbin_SCRIPTS += scripts/vyatta-log-commit.pl sbin_SCRIPTS += scripts/vyos-user-precommit-hooks.sh diff --git a/functions/interpreter/vyatta-cfg-run b/functions/interpreter/vyatta-cfg-run index 2f8f50d..50d6071 100644 --- a/functions/interpreter/vyatta-cfg-run +++ b/functions/interpreter/vyatta-cfg-run @@ -185,7 +185,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 3102690..38f47d6 100755 --- a/scripts/vyatta-cfg-cmd-wrapper +++ b/scripts/vyatta-cfg-cmd-wrapper @@ -79,7 +79,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}" |