From 4aa1f9eda7ce761a7e38bfd7b8a4ef3610d53feb Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Thu, 12 Mar 2020 14:18:56 -0500
Subject: [boot-config-loader] T1622: use vyos-boot-config-loader, if available

---
 scripts/init/vyos-router | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router
index 9fc8a51..2668390 100755
--- a/scripts/init/vyos-router
+++ b/scripts/init/vyos-router
@@ -98,7 +98,12 @@ load_bootfile ()
         # build-specific environment for boot-time config loading
         source /etc/default/vyatta-load-boot
       fi
-      sg ${GROUP} -c "$vyatta_sbindir/vyatta-boot-config-loader $BOOTFILE"
+      if [ -x $vyos_libexec_dir/vyos-boot-config-loader.py ]; then
+          sg ${GROUP} -c "$vyos_libexec_dir/vyos-boot-config-loader.py $BOOTFILE"
+      else
+          # if not available, fallback to earlier version
+          sg ${GROUP} -c "$vyatta_sbindir/vyatta-boot-config-loader $BOOTFILE"
+      fi
     )
 }
 
-- 
cgit v1.2.3