diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-09-14 19:06:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-14 19:06:23 +0200 |
| commit | c5498ec219d02c1f671c0ff8b8e780d684ee24b0 (patch) | |
| tree | 1ac745e17c8a0b603074e7710d2af2abbf5e2dff /src/init/vyos-router | |
| parent | ed3c1137d65c30629263fa62e4cc9ea2817b9d0c (diff) | |
| parent | 67e95d8287477b3c74c4c91339143f7ec9ba6a77 (diff) | |
| download | vyos-1x-c5498ec219d02c1f671c0ff8b8e780d684ee24b0.tar.gz vyos-1x-c5498ec219d02c1f671c0ff8b8e780d684ee24b0.zip | |
Merge pull request #2254 from vyos/mergify/bp/sagitta/pr-2245
frr: T5239: fix process startup order (backport #2245)
Diffstat (limited to 'src/init/vyos-router')
| -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 |