From e2a166772be55631e4bae521a9e1f9d95672ca2b Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 7 Oct 2015 16:14:09 -0700 Subject: [PATCH] coreos-kernel: restore filesystem cmdline options in amd64 kernel Even though these are now in the bootloader config we cannot drop them from the kernel because we do not update out bootloader. These should not have been dropped in commit 24508b203 :( --- ...coreos-kernel-4.2.2.ebuild => coreos-kernel-4.2.2-r1.ebuild} | 0 .../sys-kernel/coreos-kernel/files/amd64_defconfig-4.2 | 2 ++ 2 files changed, 2 insertions(+) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.2.2.ebuild => coreos-kernel-4.2.2-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.2.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.2.2-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.2.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.2.2-r1.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 209bb4a942..9714ee002c 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,6 +96,8 @@ CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_CRASH_DUMP=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_ALIGN=0x1000000 +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="rootflags=rw mount.usrflags=ro" CONFIG_HIBERNATION=y # CONFIG_ACPI_AC is not set # CONFIG_ACPI_BATTERY is not set