commit: 5e2cec54f6970c5edba0c4fe85e37f1c6652f844
Author: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 16 17:58:31 2025 +0000
Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Thu Oct 16 18:01:54 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e2cec54
kernel-build.eclass: avoid setting root in generic-uki
This we added originally because several tool got confused when there
is no root= at all. This has since been resolved and I have been
running without any root= set for several months without problems.
Setting root=/dev/gpt-auto-generator actually breaks automatic
decryption of LUKS volumes, so lets get rid of it. Functionally
nothing else changes since the gpt-auto-generator will also run if
root is not set or empty.
Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>
eclass/kernel-build.eclass | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
index 2b16d0a226dd..aa0f7b5894ea 100644
--- a/eclass/kernel-build.eclass
+++ b/eclass/kernel-build.eclass
@@ -113,10 +113,10 @@ IUSE="+strip"
# empty, then the contents are used as the first kernel cmdline
# option of the multi-profile generic UKI. Supplementing the four
# standard options of:
-# - root=/dev/gpt-auto-root ro
-# - root=/dev/gpt-auto-root ro quiet splash
-# - root=/dev/gpt-auto-root ro lockdown=integrity
-# - root=/dev/gpt-auto-root ro quiet splash lockdown=integrity
+# - ro
+# - ro quiet splash
+# - ro lockdown=integrity
+# - ro quiet splash lockdown=integrity
if [[ ${KERNEL_IUSE_MODULES_SIGN} ]]; then
IUSE+=" modules-sign"
@@ -581,10 +581,10 @@ kernel-build_src_install() {
)
cmdlines+=(
- "root=/dev/gpt-auto-root ro"
- "root=/dev/gpt-auto-root ro quiet splash"
- "root=/dev/gpt-auto-root ro lockdown=integrity"
- "root=/dev/gpt-auto-root ro quiet splash
lockdown=integrity"
+ "ro"
+ "ro quiet splash"
+ "ro lockdown=integrity"
+ "ro quiet splash lockdown=integrity"
)
local ukify_args=(
