From 3b7d2170c410eacf09ae5160fc5889bdd7acea52 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Tue, 27 Aug 2019 08:36:40 -0500 Subject: T1398: remove reference to deprecated version script --- scripts/init/vyos-router | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router index e9a8cae..0a0f6f1 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 -- cgit v1.2.3 From 2efab7cecff92a44245fdc32d928faf6386a6e03 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Sat, 31 Aug 2019 18:25:34 -0500 Subject: [boot-config-loader] T1622: Add failsafe and backtrace to boot config loader --- scripts/init/vyos-router | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router index 0a0f6f1..0a8eb8d 100755 --- a/scripts/init/vyos-router +++ b/scripts/init/vyos-router @@ -98,7 +98,7 @@ 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" + sg ${GROUP} -c "$vyos_libexec_dir/vyos-boot-config-loader.py $BOOTFILE" ) } -- cgit v1.2.3 From 710728ee8eb6def82f9a142468960f6985dcf4e8 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Sep 2019 20:37:48 +0200 Subject: Revert "[boot-config-loader] T1622: Add failsafe and backtrace to boot config loader" This reverts commit 2efab7cecff92a44245fdc32d928faf6386a6e03. --- scripts/init/vyos-router | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router index 0a8eb8d..0a0f6f1 100755 --- a/scripts/init/vyos-router +++ b/scripts/init/vyos-router @@ -98,7 +98,7 @@ load_bootfile () # build-specific environment for boot-time config loading source /etc/default/vyatta-load-boot fi - sg ${GROUP} -c "$vyos_libexec_dir/vyos-boot-config-loader.py $BOOTFILE" + sg ${GROUP} -c "$vyatta_sbindir/vyatta-boot-config-loader $BOOTFILE" ) } -- cgit v1.2.3 From 9e74ad7ef0c043bc7bd1fa14b6708cc11ab3bc5c Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Tue, 1 Oct 2019 11:31:42 -0500 Subject: T1424: Rewrite the config load script --- etc/bash_completion.d/vyatta-cfg | 16 ++++++++-------- functions/interpreter/vyatta-cfg-run | 2 +- functions/wrapper/script-template | 2 +- scripts/vyatta-cfg-cmd-wrapper | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'scripts') 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 " \t\t\t\tLoad from system config file" - echo -e " \t\t\t\tLoad from file on local machine" - echo -e " scp://:@/\tLoad from file on remote machine" - echo -e " sftp://:@/\tLoad from file on remote machine" - echo -e " ftp://:@/\tLoad from file on remote machine" - echo -e " http:///\t\t\tLoad from file on remote machine" - echo -e " https:///\t\t\tLoad from file on remote machine" - echo -e " tftp:///\t\t\tLoad from file on remote machine" + echo -e " \t\t\t\t\tLoad from system config file" + echo -e " \t\t\t\t\tLoad from file on local machine" + echo -e " scp://[:]@/\t\tLoad from file on remote machine" + echo -e " sftp://[:]@/\tLoad from file on remote machine" + echo -e " http:///\t\t\t\tLoad from file on remote machine" + echo -e " https:///\t\t\t\tLoad from file on remote machine" + echo -e " ftp://[:]@/\t\tLoad from file on remote machine" + echo -e " tftp:///\t\t\t\tLoad from file on remote machine" elif [ "$command" = "merge" ]; then echo -e " \t\t\t\t\tMerge from file on local machine" echo -e " scp://[:]@/\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/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 -- cgit v1.2.3 From 8fa0ba1fd39145368f04576323ab3a29f42a508d Mon Sep 17 00:00:00 2001 From: hagbard Date: Tue, 8 Oct 2019 09:42:58 -0700 Subject: frr - typo fixed to stop frr --- scripts/init/vyos-router | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router index 0a0f6f1..8949f53 100755 --- a/scripts/init/vyos-router +++ b/scripts/init/vyos-router @@ -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 -- cgit v1.2.3