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 <[email protected]>
---
 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=(
-- 
2.51.0


Reply via email to