switch to gpt-auto

sapcc · Jun 10, 2024 · 830a549 · 830a549
1 parent fc87809
commit 830a549
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/features/_boot/file.include/usr/local/sbin/update-kernel-cmdline b/features/_boot/file.include/usr/local/sbin/update-kernel-cmdline
@@ -10,5 +10,5 @@ for i in "${configDir}"/*-*.cfg; do
 	source $i
 done
 
-echo "root=${DEVICE} ${CMDLINE_LINUX}" > /etc/kernel/cmdline.new
+echo "root=gpt-auto ${CMDLINE_LINUX} systemd.gpt_auto" > /etc/kernel/cmdline.new
 mv /etc/kernel/cmdline.new /etc/kernel/cmdline
diff --git a/features/_readonly/file.include/etc/kernel/cmdline.d/99-no-gpt-auto.cfg b/features/_readonly/file.include/etc/kernel/cmdline.d/99-no-gpt-auto.cfg
diff --git a/features/_readonly/file.include/etc/kernel/cmdline.d/99-usr-verity.cfg b/features/_readonly/file.include/etc/kernel/cmdline.d/99-usr-verity.cfg
@@ -0,0 +1 @@
+CMDLINE_LINUX="$CMDLINE_LINUX mount.usr=/dev/mapper/verity_usr mount.usrfstype=ext4 mount.usrflags=ro systemd.verity"
diff --git a/features/_secureboot/file.include/usr/local/sbin/update-kernel-cmdline b/features/_secureboot/file.include/usr/local/sbin/update-kernel-cmdline
@@ -10,5 +10,5 @@ for i in "${configDir}"/*-*.cfg; do
 	source $i
 done
 
-echo "root=${DEVICE} ${CMDLINE_LINUX}" > /etc/kernel/cmdline.new
+echo "root=gpt-auto ${CMDLINE_LINUX}" > /etc/kernel/cmdline.new
 mv /etc/kernel/cmdline.new /etc/kernel/cmdline
diff --git a/features/base/file.include/etc/kernel/cmdline.d/99-root-options.cfg b/features/base/file.include/etc/kernel/cmdline.d/99-root-options.cfg
@@ -0,0 +1 @@
+CMDLINE_LINUX="$CMDLINE_LINUX rootflags=rw,errors=remount-ro,prjquota,discard"