gardenlinux · toanju · Feb 7, 2025 · Feb 7, 2025 · Feb 7, 2025 · Feb 7, 2025
diff --git a/features/orabos/exec.config b/features/orabos/exec.config
@@ -16,9 +16,6 @@ IMAGE_VERSION=${BUILDER_VERSION}
 VARIANT_ID=${BUILDER_CNAME%-*}
 EOF
 
-# Add correct root partition to cmdline
-echo "DEVICE=\"LABEL=garden_${BUILDER_VERSION}\"" > /etc/kernel/cmdline.d/000-root.cfg
-
 function create() {
   NAME=$1
   shift
@@ -44,4 +41,4 @@ chmod 0600 /var/lib/nova/.ssh
 
 # limit vnc port autorange to possible kubernetes nodeports
 sed -i 's/#remote_display_port_min = 5900/remote_display_port_min = 32200/' /etc/libvirt/qemu.conf
-sed -i 's/#remote_display_port_max = 65535/remote_display_port_max = 32299/' /etc/libvirt/qemu.conf
+sed -i 's/#remote_display_port_max = 65535/remote_display_port_max = 32299/' /etc/libvirt/qemu.conf
diff --git a/features/orabos/file.exclude b/features/orabos/file.exclude
@@ -1,4 +1,2 @@
 /etc/systemd/network/99-default.network
 /etc/systemd/system/systemd-resolved.service.d/wait-for-networkd.conf
-/etc/repart.d/root.conf
-/etc/kernel/cmdline.d/99-no-gpt-auto.cfg
diff --git a/features/orabos/file.include/etc/kernel/cmdline.d/00-default.cfg b/features/orabos/file.include/etc/kernel/cmdline.d/00-default.cfg
@@ -1,4 +1,5 @@
 # DO NOT CHANGE THIS FILE! USE /etc/kernel/cmdline.d
 CMDLINE_LINUX="ro consoleblank=0"
+DEVICE="LABEL=ROOT"
 # WARNING! 0 disables the TIMEOUT
 TIMEOUT=1
diff --git a/features/orabos/file.include/etc/kernel/tries b/features/orabos/file.include/etc/kernel/tries
diff --git a/features/orabos/file.include/etc/repart.d/10_root_a.conf b/features/orabos/file.include/etc/repart.d/10_root_a.conf
diff --git a/features/orabos/file.include/etc/repart.d/25_root_b.conf b/features/orabos/file.include/etc/repart.d/25_root_b.conf
diff --git a/features/orabos/file.include/etc/repart.d/30_home.conf b/features/orabos/file.include/etc/repart.d/30_home.conf
diff --git a/features/orabos/file.include/etc/repart.d/40_var.conf b/features/orabos/file.include/etc/repart.d/40_var.conf
diff --git a/features/orabos/file.include/etc/systemd/system/home.mount b/features/orabos/file.include/etc/systemd/system/home.mount
diff --git a/features/orabos/file.include/etc/systemd/system/local-fs.target.wants/home.mount b/features/orabos/file.include/etc/systemd/system/local-fs.target.wants/home.mount
diff --git a/features/orabos/file.include/etc/systemd/system/local-fs.target.wants/var.mount b/features/orabos/file.include/etc/systemd/system/local-fs.target.wants/var.mount
diff --git a/features/orabos/file.include/etc/systemd/system/systemd-sysupdate-reboot.timer b/features/orabos/file.include/etc/systemd/system/systemd-sysupdate-reboot.timer
diff --git a/features/orabos/file.include/etc/systemd/system/systemd-sysupdate@.service b/features/orabos/file.include/etc/systemd/system/systemd-sysupdate@.service
diff --git a/features/orabos/file.include/etc/systemd/system/var.mount b/features/orabos/file.include/etc/systemd/system/var.mount
diff --git a/features/orabos/file.include/etc/sysupdate.d/10-root.conf b/features/orabos/file.include/etc/sysupdate.d/10-root.conf
diff --git a/features/orabos/file.include/etc/sysupdate.d/20-efi.conf b/features/orabos/file.include/etc/sysupdate.d/20-efi.conf
diff --git a/...abos/file.include/usr/local/lib/systemd/system-preset/50-no-sysupdate-reboot-timer.preset b/...abos/file.include/usr/local/lib/systemd/system-preset/50-no-sysupdate-reboot-timer.preset
diff --git a/features/orabos/fstab.mod b/features/orabos/fstab.mod
diff --git a/features/orabos/image.efi b/features/orabos/image.efi
diff --git a/features/orabos/pkg.include b/features/orabos/pkg.include
@@ -4,4 +4,3 @@ open-iscsi
 openvswitch-switch
 conntrack
 parted
-systemd-container