From 268e11983dbe9155fe62a5a3ec2bb06c05a60ae0 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Fri, 15 Jan 2021 03:32:11 -0500 Subject: Revert "linux-libre-4.19: Override command line" This reverts commit 86ae455e135c2580ade31931fa3f457d924dd9c3. This will break lilo adding "root=...". --- diff --git a/changelog b/changelog index 625e77e..7ad2667 100644 --- a/changelog +++ b/changelog @@ -8,7 +8,6 @@ config-libiquity-testbench (1.1) trunk instead). * config-linux-libre-4.19-libiquity-testbench: Enable DMI scanning (needed by ThinkPad ACPI driver). - * config-linux-libre-4.19-libiquity-testbench: Override command line. * config-linux-libre-4.19-libiquity-testbench: Disable ACPI PCI Hotplug driver and IBM extensions (fixes "acpiphp_ibm: ibm_acpiphp_init: acpi_walk_namespace failed" error at boot). diff --git a/src/build/linux-libre-4.19_4.19.167+gnu/config b/src/build/linux-libre-4.19_4.19.167+gnu/config index dafcdae..3ce9db8 100644 --- a/src/build/linux-libre-4.19_4.19.167+gnu/config +++ b/src/build/linux-libre-4.19_4.19.167+gnu/config @@ -353,7 +353,7 @@ CONFIG_HOTPLUG_CPU=y # CONFIG_COMPAT_VDSO is not set CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="mce=0 page_poison=1 pti=on spectre_v2=off quiet" -CONFIG_CMDLINE_OVERRIDE=y +# CONFIG_CMDLINE_OVERRIDE is not set # CONFIG_MODIFY_LDT_SYSCALL is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y -- cgit v0.9.1