diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-09-22 06:16:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-22 06:16:27 +0200 |
| commit | 7e16cea1897eba08f8e11bc5c600fcf8dc2cb591 (patch) | |
| tree | 4c311798843e1544abeb04843a8cdf62a1c5ea1d /src/init | |
| parent | 11edfade9f5ba181720099783f77dce9e282403c (diff) | |
| parent | e8581998c2bfbbee349eee89df6d59cc6c4fca16 (diff) | |
| download | vyos-1x-7e16cea1897eba08f8e11bc5c600fcf8dc2cb591.tar.gz vyos-1x-7e16cea1897eba08f8e11bc5c600fcf8dc2cb591.zip | |
Merge pull request #2292 from vyos/mergify/bp/sagitta/pr-2289
init: T5239: configure system hostname prior to FRR startup (backport #2289)
Diffstat (limited to 'src/init')
| -rwxr-xr-x | src/init/vyos-router | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/init/vyos-router b/src/init/vyos-router index cc69fae5a..b8833a8a0 100755 --- a/src/init/vyos-router +++ b/src/init/vyos-router @@ -371,8 +371,11 @@ 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" + # T5239: early read of system hostname as this value is read-only once during + # FRR initialisation + tmp=$(${vyos_libexec_dir}/read-saved-value.py --path "system host-name") + hostnamectl set-hostname --static "$tmp" + ${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! |