From 4bbb38298847fc772afb12f17cef911dee1a48a5 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 8 Jun 2023 21:12:12 +0200 Subject: startup: T5239: ensure system hostname is set before FRR starts --- scripts/init/vyos-router | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scripts') 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 -- cgit v1.2.3