From f474a575f23465dfe93ba2ae44a8076659c5546a Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Thu, 10 Mar 2022 10:23:28 -0600
Subject: Revert "save-config: T4292: use vyos-save-config.py"

This reverts commit 18e2864769226e39479cf3fc3be2dc5ec67acac1.
Revert while investigating failure in vyos-configtest.
---
 Makefile.am                          | 1 +
 functions/interpreter/vyatta-cfg-run | 2 +-
 functions/wrapper/script-template    | 2 +-
 scripts/vyatta-cfg-cmd-wrapper       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b5ce47c..00813cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,6 +121,7 @@ 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 5696b41..5e0ce42 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="${vyos_libexec_dir}/vyos-save-config.py"
+  local save_cmd="${vyatta_sbindir}/vyatta-save-config.pl"
   for arg in "$@"; do
     save_cmd+=" '$arg'"
   done
diff --git a/functions/wrapper/script-template b/functions/wrapper/script-template
index 4318fe5..f88f410 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="${vyos_libexec_dir}/vyos-save-config.py"
+  local save_cmd="${vyatta_sbindir}/vyatta-save-config.pl"
   for arg in "$@"; do
     save_cmd+=" '$arg'"
   done
diff --git a/scripts/vyatta-cfg-cmd-wrapper b/scripts/vyatta-cfg-cmd-wrapper
index b559e3b..896f7ed 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 ${vyos_libexec_dir}/vyos-save-config.py "${@:2}"
+    exec ${vyatta_sbindir}/vyatta-save-config.pl "${@:2}"
     ;;
   load)
     exec ${vyos_libexec_dir}/vyos-load-config.py "${@:2}"
-- 
cgit v1.2.3