From 1dd86e02779f3b892c5203f74c514c03248af1ae Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Tue, 22 Aug 2023 09:33:11 -0500
Subject: [PATCH] save-config: T4292: use vyos-save-config.py

---
 Makefile.am                          | 1 -
 functions/interpreter/vyatta-cfg-run | 2 +-
 functions/wrapper/script-template    | 2 +-
 scripts/vyatta-cfg-cmd-wrapper       | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 44343031f..c175d7d29 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 2f8f50da6..50d607115 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 f88f410de..4318fe5fe 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 3102690bf..38f47d6c7 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}"