From acd8813f166cd26eb2a02b5c55aaaa1445d39af5 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Sun, 19 Jan 2020 20:47:46 +0100 Subject: T1970: init: delay initialization of vyos-router to udev is setteled On devices with many nic's udev initialization and nic renaming could take a lot of time, this commit delays vyos-router startup until udev is completed, and thouse all nic renaming processes are completed prior to starting vyos-router --- scripts/init/vyos-router | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'scripts') diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router index a211795..60f1a78 100755 --- a/scripts/init/vyos-router +++ b/scripts/init/vyos-router @@ -173,6 +173,15 @@ bind_mount_boot () start () { + log_daemon_msg "Waiting for NIC's to settle down" + # On boot time udev migth take a long time to reorder nic's, this will ensure that + # all udev activity is completed and all nics presented at boot-time will have their + # final name before continuing with vyos-router initialization. + SECONDS=0 + udevadm settle + STATUS=$? + log_progress_msg "setteled in ${SECONDS}sec." + log_end_msg ${STATUS} # Fixup for FRR # In 5.1 master, zebra thinks existence of /var/run/netns is -- cgit v1.2.3 From 68c31a9934dbebc507f556593c9d80270138c4f5 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 60f1a78..66cfcfb 100755 --- a/scripts/init/vyos-router +++ b/scripts/init/vyos-router @@ -253,7 +253,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