Merge pull request #67 from jestabro/save-config

save-config: T4292: use vyos-save-config.py

Author: jestabro

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

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

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

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}"