Always ensure a Rancher-vWXYZ transient hostname (#1264)

If a static hostname is not available always set a transient hostname in the form "Rancher-VWXYZ". Do that also when in recovery mode. Fixes: rancher/elemental-operator#646 Signed-off-by: Francesco Giudici <francesco.giudici@suse.com>
rancher · Mar 5, 2024 · 6935634 · 6935634
1 parent fb0f33a
commit 6935634
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/framework/files/system/oem/01_elemental-rootfs.yaml b/framework/files/system/oem/01_elemental-rootfs.yaml
@@ -3,11 +3,7 @@ stages:
   initramfs:
     - if: '[ ! -f /run/elemental/recovery_mode ]'
       commands:
-      - |
-        if [ ! -e /run/elemental/persistent/etc/hostname ]; then
-          sysctl kernel.hostname=rancher-${RANDOM}
-        fi
-        ln -sf /run/elemental/persistent/etc/hostname /etc/hostname
+        - ln -sf /run/elemental/persistent/etc/hostname /etc/hostname
     - if: '[ ! -f "/run/elemental/recovery_mode" ]'
       name: "Persist /etc/machine-id"
       commands:

diff --git a/framework/files/system/oem/03_hostname.yaml b/framework/files/system/oem/03_hostname.yaml
@@ -0,0 +1,6 @@
+name: "Fallback hostname"
+stages:
+  initramfs:
+    - if: '[ ! -f /etc/hostname ]'
+      commands:
+        - sysctl kernel.hostname=rancher-${RANDOM}