Use the elemental-rootfs feature (#1163)

Use the elemental-rootfs feature The new elemental-rootfs and elemental-sysroot features are drop-in replacements for immutable-rootfs feature. Signed-off-by: Fredrik Lönnegren <fredrik.lonnegren@suse.com>
rancher · Jan 11, 2024 · c1f29a3 · c1f29a3
1 parent 42f9759
commit c1f29a3
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/.obs/dockerfile/slem-base-os/Dockerfile b/.obs/dockerfile/slem-base-os/Dockerfile
@@ -99,7 +99,7 @@ RUN zypper clean --all && \
     rm -rf /boot/vmlinux*
 
 # Rebuild initrd to setup dracut with the boot configurations
-RUN elemental init --force immutable-rootfs,grub-config,dracut-config,cloud-config-essentials,elemental-setup && \
+RUN elemental init --force elemental-rootfs,elemental-sysroot,grub-config,dracut-config,cloud-config-essentials,elemental-setup && \
     # aarch64 has an uncompressed kernel so we need to link it to vmlinuz
     kernel=$(ls /boot/Image-* 2>/dev/null | head -n1) && \
     if [ -e "$kernel" ]; then ln -sf "${kernel#/boot/}" /boot/vmlinuz; fi
diff --git a/.obs/dockerfile/slem-flavored-os/Dockerfile b/.obs/dockerfile/slem-flavored-os/Dockerfile
@@ -70,7 +70,7 @@ RUN rm -rf /var/log/update* && \
     rm -rf /boot/vmlinux*
 
 # Rebuild initrd to setup dracut with the boot configurations
-RUN elemental init --force immutable-rootfs,grub-config,dracut-config,cloud-config-essentials,elemental-setup && \
+RUN elemental init --force elemental-rootfs,elemental-sysroot,grub-config,dracut-config,cloud-config-essentials,elemental-setup && \
     # aarch64 has an uncompressed kernel so we need to link it to vmlinuz
     kernel=$(ls /boot/Image-* 2>/dev/null | head -n1) && \
     if [ -e "$kernel" ]; then ln -sf "${kernel#/boot/}" /boot/vmlinuz; fi
diff --git a/framework/files/system/oem/01_elemental-rootfs.yaml b/framework/files/system/oem/01_elemental-rootfs.yaml
@@ -26,7 +26,7 @@ stages:
   rootfs:
     - if: '[ ! -f "/run/elemental/recovery_mode" ]'
       name: "Layout configuration"
-      environment_file: /run/cos/cos-layout.env
+      environment_file: /run/elemental/mount-layout.env
       environment:
         OVERLAY: "tmpfs:25%"
         RW_PATHS: "/var /etc /srv"
@@ -51,6 +51,6 @@ stages:
     - if: '[ -f "/run/elemental/recovery_mode" ]'
       # omit the persistent partition on recovery mode
       name: "Layout configuration for recovery"
-      environment_file: /run/cos/cos-layout.env
+      environment_file: /run/elemental/mount-layout.env
       environment:
         OVERLAY: "tmpfs:25%"
diff --git a/framework/files/system/oem/05_motd_and_autologin.yaml b/framework/files/system/oem/05_motd_and_autologin.yaml
@@ -1,7 +1,7 @@
 name: "Root autologin"
 stages:
   initramfs:
-  - if: '[ -f /run/cos/live_mode ]'
+  - if: '[ -f /run/elemental/live_mode ]'
     files:
     - path: /etc/motd
       content: |

diff --git a/framework/files/system/oem/99_elemental-register-install.yaml b/framework/files/system/oem/99_elemental-register-install.yaml
@@ -1,6 +1,6 @@
 name: "Elemental Register install"
 stages:
   network.after:
-    - if: '[ -f /run/cos/live_mode ]'
+    - if: '[ -f /run/elemental/live_mode ]'
       commands:
         - systemctl start elemental-register-install
diff --git a/framework/files/system/oem/99_elemental-register-timer.yaml b/framework/files/system/oem/99_elemental-register-timer.yaml
@@ -1,6 +1,6 @@
 name: "Elemental Register start"
 stages:
   network.after:
-    - if: '[ ! -f /run/cos/live_mode ] && [ ! -f /run/cos/recovery_mode ]'
+    - if: '[ ! -f /run/elemental/live_mode ] && [ ! -f /run/elemental/recovery_mode ]'
       commands:
         - systemctl start elemental-register.timer
diff --git a/framework/files/usr/sbin/suc-upgrade b/framework/files/usr/sbin/suc-upgrade
@@ -5,7 +5,7 @@ RELEASE_FILE="${RELEASE_FILE:-/etc/os-release}"
 CONF_FILE="${CONF_FILE:-/run/data/cloud-config}"
 LOCK_TIMEOUT="${LOCK_TIMEOUT:-600}"
 LOCK_FILE="${LOCK_FILE:-$HOST_DIR/run/elemental/upgrade.lock}"
-ACTIVE_FILE="${ACTIVE_FILE:-$HOST_DIR/run/cos/active_mode}"
+ACTIVE_FILE="${ACTIVE_FILE:-$HOST_DIR/run/elemental/active_mode}"
 
 mkdir -p $HOST_DIR/run/elemental
 
@@ -101,12 +101,15 @@ function isActiveSystem() {
     mount --rbind $HOST_DIR/run /run
     elemental --debug upgrade --system.uri dir:/
 
+    STATE_PATH=/run/initramfs/elemental-state
+    [ ! -d "${STATE_PATH}" ] && STATE_PATH=/run/initramfs/cos-state
+
     # After elemental upgrade we have to also copy
     # /etc/resolv.conf from /host filesystem, otherwise
     # it will be taken from container context
-    mount -o remount,rw /run/initramfs/cos-state
+    mount -o remount,rw $STATE_PATH
     LOOP_DEV=$(losetup -f)
-    losetup $LOOP_DEV /run/initramfs/cos-state/cOS/active.img
+    losetup $LOOP_DEV ${STATE_PATH}/cOS/active.img
     mkdir -p /tmp/cOS
     mount $LOOP_DEV /tmp/cOS
     rsync -av $HOST_DIR/etc/resolv.conf /tmp/cOS/etc/resolv.conf