diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-09-19 20:38:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-19 20:38:52 +0200 |
| commit | 483482f16133d5aa61b07a88cca5bce7bb7776f8 (patch) | |
| tree | 0e54ea3bb667a425214f04aeb9d0b3b79faa71c7 /src/init | |
| parent | db53c8e77cd93d5d7f16036b4d7b783083caf32e (diff) | |
| parent | ac21a4e69fac27504b62927a20d0a6a273abb034 (diff) | |
| download | vyos-1x-483482f16133d5aa61b07a88cca5bce7bb7776f8.tar.gz vyos-1x-483482f16133d5aa61b07a88cca5bce7bb7776f8.zip | |
Merge pull request #2289 from c-po/t5239-frr
init: T5239: configure system hostname prior to FRR startup
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 9ef1fa335..dd07d2e4b 100755 --- a/src/init/vyos-router +++ b/src/init/vyos-router @@ -374,8 +374,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! |