Merge pull request #1577 from marineam/kernel-opts

coreos-kernel: restore filesystem cmdline options in amd64 kernel
This commit is contained in:
Michael Marineau 2015-10-07 16:21:46 -07:00
commit 16a699059a
2 changed files with 2 additions and 0 deletions

View File

@ -96,6 +96,8 @@ CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
CONFIG_CRASH_DUMP=y CONFIG_CRASH_DUMP=y
CONFIG_KEXEC_JUMP=y CONFIG_KEXEC_JUMP=y
CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="rootflags=rw mount.usrflags=ro"
CONFIG_HIBERNATION=y CONFIG_HIBERNATION=y
# CONFIG_ACPI_AC is not set # CONFIG_ACPI_AC is not set
# CONFIG_ACPI_BATTERY is not set # CONFIG_ACPI_BATTERY is not set