summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-06-08 21:12:12 +0200
committerChristian Breunig <christian@breunig.cc>2023-06-08 21:12:12 +0200
commit4bbb38298847fc772afb12f17cef911dee1a48a5 (patch)
treea4ba6c5b4ad70026f452a09db899fbea05916efa
parent3b340d769e3c2e37f7a32d2611d88e7e6394a201 (diff)
downloadvyatta-cfg-4bbb38298847fc772afb12f17cef911dee1a48a5.tar.gz
vyatta-cfg-4bbb38298847fc772afb12f17cef911dee1a48a5.zip
startup: T5239: ensure system hostname is set before FRR starts
-rwxr-xr-xscripts/init/vyos-router6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router
index 47896d1..2a05aa3 100755
--- a/scripts/init/vyos-router
+++ b/scripts/init/vyos-router
@@ -317,6 +317,10 @@ 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 /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"
@@ -397,7 +401,7 @@ stop()
umount ${vyatta_configdir}
log_action_end_msg $?
- /usr/lib/frr/frrinit.sh stop
+ systemctl stop frr.service
}
case "$action" in