diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-09-13 13:41:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-13 13:41:50 +0200 |
| commit | 1bc808742f554531ba5ef22c1d42e4ced5ba4595 (patch) | |
| tree | 999cbdd364ae3676482d7c758ab632a3738d3001 /src/init | |
| parent | 4a51fb08e73d259bab87e154f99fb5c3e85fbc46 (diff) | |
| parent | d4b9b2aa5f5dda6a11b7038ab0ab52653531183d (diff) | |
| download | vyos-1x-1bc808742f554531ba5ef22c1d42e4ced5ba4595.tar.gz vyos-1x-1bc808742f554531ba5ef22c1d42e4ced5ba4595.zip | |
Merge pull request #2245 from c-po/t5239-frr
frr: T5239: fix process startup order
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 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 |