m/node: move kernel cmdline to the unified kernel image
The upcoming installer code relies on its own params.
Change-Id: I6408ffa3f14ae184e05786a48b59499ac25d8928
Reviewed-on: https://review.monogon.dev/c/monogon/+/406
Reviewed-by: Leopold Schabel <leo@nexantic.com>
diff --git a/metropolis/node/BUILD.bazel b/metropolis/node/BUILD.bazel
index da5fb8a..9899402 100644
--- a/metropolis/node/BUILD.bazel
+++ b/metropolis/node/BUILD.bazel
@@ -93,6 +93,7 @@
efi_unified_kernel_image(
name = "kernel_efi",
+ cmdline = "console=ttyS0 root=PARTLABEL=METROPOLIS-SYSTEM rootfstype=erofs init=/init",
kernel = "//third_party/linux",
os_release = ":os-release-info",
)
diff --git a/third_party/linux/linux-metropolis.config b/third_party/linux/linux-metropolis.config
index 410463d..fc89494 100644
--- a/third_party/linux/linux-metropolis.config
+++ b/third_party/linux/linux-metropolis.config
@@ -447,8 +447,8 @@
# CONFIG_LEGACY_VSYSCALL_EMULATE is not set
# CONFIG_LEGACY_VSYSCALL_XONLY is not set
CONFIG_LEGACY_VSYSCALL_NONE=y
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyS0 root=PARTLABEL=METROPOLIS-SYSTEM rootfstype=erofs init=/init"
+CONFIG_CMDLINE_BOOL=n
+CONFIG_CMDLINE=""
CONFIG_CMDLINE_OVERRIDE=y
CONFIG_MODIFY_LDT_SYSCALL=y
CONFIG_HAVE_LIVEPATCH=y