diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-09-11 21:58:42 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-09-13 11:42:27 +0000 |
| commit | 3bde0d7b96cbb8c699011f5ce8988bece80a8945 (patch) | |
| tree | a04c59254472e3b2fe91d839c5e15d45b71f5975 /src/init | |
| parent | 3d9a0b02d031a97b099ef6fe4ba07d7ce7eb958e (diff) | |
| download | vyos-1x-3bde0d7b96cbb8c699011f5ce8988bece80a8945.tar.gz vyos-1x-3bde0d7b96cbb8c699011f5ce8988bece80a8945.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.
(cherry picked from commit df74a09b80df0c2ec769a10ef4f7bac01f50eb2d)
Diffstat (limited to 'src/init')
| -rwxr-xr-x | src/init/vyos-router | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/init/vyos-router b/src/init/vyos-router index 96f163213..8572f53fc 100755 --- a/src/init/vyos-router +++ b/src/init/vyos-router @@ -337,10 +337,6 @@ start () nfct helper add tns inet 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" @@ -373,6 +369,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 |