summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorhagbard <vyosdev@derith.de>2019-10-08 09:44:10 -0700
committerhagbard <vyosdev@derith.de>2019-10-08 09:44:10 -0700
commita2c7b5f78cd0439599686147494e4f683618e14a (patch)
tree52257c4ddfb650786fa6114591cfecde71c89add /scripts
parente8bb5818b84dd9728b77e78dcef08869ca1146d5 (diff)
parent8fa0ba1fd39145368f04576323ab3a29f42a508d (diff)
downloadvyatta-cfg-a2c7b5f78cd0439599686147494e4f683618e14a.tar.gz
vyatta-cfg-a2c7b5f78cd0439599686147494e4f683618e14a.zip
Merge branch 'current' into equuleus
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/init/vyos-router4
-rwxr-xr-xscripts/vyatta-cfg-cmd-wrapper2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router
index e9a8cae..8949f53 100755
--- a/scripts/init/vyos-router
+++ b/scripts/init/vyos-router
@@ -72,7 +72,7 @@ init_bootfile () {
if [ -f $vyatta_sysconfdir/config.boot.default ]; then
cp $vyatta_sysconfdir/config.boot.default $BOOTFILE
else
- $vyatta_sbindir/vyatta_current_conf_ver.pl > $BOOTFILE
+ $vyos_libexec_dir/system-versions-foot.py > $BOOTFILE
fi
chgrp ${GROUP} $BOOTFILE
@@ -244,7 +244,7 @@ stop()
umount ${vyatta_configdir}
log_action_end_msg $?
- /usr/lib/frr/frr stop
+ /usr/lib/frr/frrinit.sh stop
}
case "$action" in
diff --git a/scripts/vyatta-cfg-cmd-wrapper b/scripts/vyatta-cfg-cmd-wrapper
index 952112f..896f7ed 100755
--- a/scripts/vyatta-cfg-cmd-wrapper
+++ b/scripts/vyatta-cfg-cmd-wrapper
@@ -81,7 +81,7 @@ case "$1" in
exec ${vyatta_sbindir}/vyatta-save-config.pl "${@:2}"
;;
load)
- exec ${vyatta_sbindir}/vyatta-load-config.pl "${@:2}"
+ exec ${vyos_libexec_dir}/vyos-load-config.py "${@:2}"
;;
rule-rename)
# this option is to be used for renaming firewall and nat rules only