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@gentoo.org>
This commit is contained in:
Nowa Ammerlaan
2025-10-16 19:58:31 +02:00
parent 012278a0d2
commit 5e2cec54f6

View File

@@ -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=(