summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xetc/bash_completion.d/vyatta-cfg16
-rw-r--r--functions/interpreter/vyatta-cfg-run2
-rw-r--r--functions/wrapper/script-template2
-rwxr-xr-xscripts/init/vyos-router4
-rwxr-xr-xscripts/vyatta-cfg-cmd-wrapper2
5 files changed, 13 insertions, 13 deletions
diff --git a/etc/bash_completion.d/vyatta-cfg b/etc/bash_completion.d/vyatta-cfg
index cf72330..a2c3332 100755
--- a/etc/bash_completion.d/vyatta-cfg
+++ b/etc/bash_completion.d/vyatta-cfg
@@ -192,14 +192,14 @@ vyatta_loadsave_complete()
echo
echo "Possible completions:"
if [ "$command" = "load" ]; then
- echo -e " <Enter>\t\t\t\tLoad from system config file"
- echo -e " <file>\t\t\t\tLoad from file on local machine"
- echo -e " scp://<user>:<passwd>@<host>/<file>\tLoad from file on remote machine"
- echo -e " sftp://<user>:<passwd>@<host>/<file>\tLoad from file on remote machine"
- echo -e " ftp://<user>:<passwd>@<host>/<file>\tLoad from file on remote machine"
- echo -e " http://<host>/<file>\t\t\tLoad from file on remote machine"
- echo -e " https://<host>/<file>\t\t\tLoad from file on remote machine"
- echo -e " tftp://<host>/<file>\t\t\tLoad from file on remote machine"
+ echo -e " <Enter>\t\t\t\t\tLoad from system config file"
+ echo -e " <file>\t\t\t\t\tLoad from file on local machine"
+ echo -e " scp://<user>[:<passwd>]@<host>/<file>\t\tLoad from file on remote machine"
+ echo -e " sftp://<user>[:<passwd>]@<host>/<file>\tLoad from file on remote machine"
+ echo -e " http://<host>/<file>\t\t\t\tLoad from file on remote machine"
+ echo -e " https://<host>/<file>\t\t\t\tLoad from file on remote machine"
+ echo -e " ftp://<user>[:<passwd>]@<host>/<file>\t\tLoad from file on remote machine"
+ echo -e " tftp://<host>/<file>\t\t\t\tLoad from file on remote machine"
elif [ "$command" = "merge" ]; then
echo -e " <file>\t\t\t\t\tMerge from file on local machine"
echo -e " scp://<user>[:<passwd>]@<host>/<file>\t\tMerge from file on remote machine"
diff --git a/functions/interpreter/vyatta-cfg-run b/functions/interpreter/vyatta-cfg-run
index a274e24..3ec3d6f 100644
--- a/functions/interpreter/vyatta-cfg-run
+++ b/functions/interpreter/vyatta-cfg-run
@@ -229,7 +229,7 @@ vyatta_config_load ()
fi
# return to top level.
reset_edit_level
- ${vyatta_sbindir}/vyatta-load-config.pl "$@"
+ ${vyos_libexec_dir}/vyos-load-config.py "$@"
}
vyatta_config_merge ()
diff --git a/functions/wrapper/script-template b/functions/wrapper/script-template
index 51cb2c0..f88f410 100644
--- a/functions/wrapper/script-template
+++ b/functions/wrapper/script-template
@@ -108,7 +108,7 @@ function load ()
fi
# return to top level.
reset_edit_level
- ${vyatta_sbindir}/vyatta-load-config.pl "$@"
+ ${vyos_libexec_dir}/vyos-load-config.py "$@"
}
function save ()
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