diff options
| author | Daniil Baturin <daniil@vyos.io> | 2020-03-09 19:03:09 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@vyos.io> | 2020-03-09 19:03:09 +0200 |
| commit | e4adaa449eb29da969d4b95f9423ff618d0b448e (patch) | |
| tree | 416437d74af5f1db78088dfd422bc8a43daade97 /scripts/init/vyos-router | |
| parent | 7a0a53a0e67cb83eebfe8a07a62f1ab348de3929 (diff) | |
| parent | 68c31a9934dbebc507f556593c9d80270138c4f5 (diff) | |
| download | vyatta-cfg-vyos/1.2.5.tar.gz vyatta-cfg-vyos/1.2.5.zip | |
Merge branch 'crux' of github.com:vyos/vyatta-cfg into cruxvyos/1.2.5
Diffstat (limited to 'scripts/init/vyos-router')
| -rwxr-xr-x | scripts/init/vyos-router | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router index a211795..66cfcfb 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 @@ -244,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 |