summaryrefslogtreecommitdiff
path: root/src/init/vyos-router
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-09-11 21:58:42 +0200
committerChristian Breunig <christian@breunig.cc>2023-09-11 22:01:11 +0200
commitdf74a09b80df0c2ec769a10ef4f7bac01f50eb2d (patch)
treed18660ec04d31c19b6e0b2a2593b8eb3b27ec2b0 /src/init/vyos-router
parentcd3dda75534abf2453c5dcd47969f4119a0e0dae (diff)
downloadvyos-1x-df74a09b80df0c2ec769a10ef4f7bac01f50eb2d.tar.gz
vyos-1x-df74a09b80df0c2ec769a10ef4f7bac01f50eb2d.zip
frr: T5239: fix process startup order
- Reuse existing utility functions to check if a boot is ongoing (boot_configuration_complete()) - Run system_frr.py script to configure FRR daemon before initial launch - Add safety net to always have FRR running on the system This does yet not solve the error in T5239 but it's a small step towards the solution.
Diffstat (limited to 'src/init/vyos-router')
-rwxr-xr-xsrc/init/vyos-router11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/init/vyos-router b/src/init/vyos-router
index a5d1a31fa..1bbb9c869 100755
--- a/src/init/vyos-router
+++ b/src/init/vyos-router
@@ -340,10 +340,6 @@ start ()
nfct helper add tns inet6 tcp
nft -f /usr/share/vyos/vyos-firewall-init.conf || log_failure_msg "could not initiate firewall rules"
- rm -f /etc/hostname
- ${vyos_conf_scripts_dir}/host_name.py || log_failure_msg "could not reset host-name"
- systemctl start frr.service
-
# As VyOS does not execute commands that are not present in the CLI we call
# the script by hand to have a single source for the login banner and MOTD
${vyos_conf_scripts_dir}/system_console.py || log_failure_msg "could not reset serial console"
@@ -376,6 +372,13 @@ start ()
&& chgrp ${GROUP} ${vyatta_configdir}
log_action_end_msg $?
+ rm -f /etc/hostname
+ ${vyos_conf_scripts_dir}/host_name.py || log_failure_msg "could not reset host-name"
+ ${vyos_conf_scripts_dir}/system_frr.py || log_failure_msg "could not reset FRR config"
+ # If for any reason FRR was not started by system_frr.py - start it anyways.
+ # This is a safety net!
+ systemctl start frr.service
+
disabled bootfile || init_bootfile
cleanup_post_commit_hooks