From 24b853a658f3e8a2b193a0c073e43d1e86a5b842 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 21 Sep 2015 14:46:37 -0700 Subject: [PATCH] coreos-kernel: drop built-in kernel command lines It is a bit misleading to have some of this configured in the kernel config and the rest in `grub.cfg` so lets simplify and stick to grub. --- ...eos-kernel-4.2.0-r1.ebuild => coreos-kernel-4.2.0-r2.ebuild} | 0 .../sys-kernel/coreos-kernel/files/amd64_defconfig-4.2 | 2 -- .../sys-kernel/coreos-kernel/files/arm64_defconfig-4.2 | 1 - 3 files changed, 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.2.0-r1.ebuild => coreos-kernel-4.2.0-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.2.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.2.0-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.2.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.2.0-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/amd64_defconfig-4.2 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/amd64_defconfig-4.2 index cdd492a73b..209bb4a942 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/amd64_defconfig-4.2 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/amd64_defconfig-4.2 @@ -96,8 +96,6 @@ CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_CRASH_DUMP=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_ALIGN=0x1000000 -CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="init=/usr/lib/systemd/systemd rootflags=rw mount.usrflags=ro" CONFIG_HIBERNATION=y # CONFIG_ACPI_AC is not set # CONFIG_ACPI_BATTERY is not set diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/arm64_defconfig-4.2 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/arm64_defconfig-4.2 index 1eb2b3bef4..2f8948a982 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/arm64_defconfig-4.2 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/arm64_defconfig-4.2 @@ -58,7 +58,6 @@ CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_CMA=y CONFIG_SECCOMP=y CONFIG_KEXEC=y -CONFIG_CMDLINE="console=ttyAMA0" # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_COMPAT=y CONFIG_CPU_IDLE=y