summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-06-08 21:18:03 +0200
committerChristian Breunig <christian@breunig.cc>2023-06-08 21:18:03 +0200
commit30f7cc7e3ca91fb7fcb15d83acfcadec5fe31c35 (patch)
tree321ec32679d886321a93c7a9a55ef24d00374236
parent4bbb38298847fc772afb12f17cef911dee1a48a5 (diff)
downloadvyatta-cfg-30f7cc7e3ca91fb7fcb15d83acfcadec5fe31c35.tar.gz
vyatta-cfg-30f7cc7e3ca91fb7fcb15d83acfcadec5fe31c35.zip
startup: T5239: force removal of /etc/hostname
Commit 4bbb382 ("startup: T5239: ensure system hostname is set before FRR starts") removed /etc/hostname but it cared about exit codes - always remove the file even if it does not exist (--force)
-rwxr-xr-xscripts/init/vyos-router2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router
index 2a05aa3..ec68db2 100755
--- a/scripts/init/vyos-router
+++ b/scripts/init/vyos-router
@@ -317,7 +317,7 @@ 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
+ rm -f /etc/hostname
${vyos_conf_scripts_dir}/host_name.py || log_failure_msg "could not reset host-name"
systemctl start frr.service