kdump/kdump-remove-root-and-resume.patch

33 lines
1.4 KiB
Diff
Raw Normal View History

From: Petr Tesarik <ptesarik@suse.cz>
Date: Thu Sep 18 10:15:59 2014 +0200
Subject: Remove root= and resume= from the kdump kernel command line
References: bnc#883883
Patch-mainline: v0.8.16
Git-commit: 8caaba657548133d476b2a13fd5abb68314927c7
Resume from hibernation should never be even attempted in kdump.
If using dracut, the module is even omitted from the initrd, so
passing the command line option only consumes command line space.
The default root device is not needed either, because all required
filesystems are handled by the mount dracut module. In fact, if the
root filesystem is also mounted, it may be mounted twice.
Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
---
init/rc.kdump.functions | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/init/rc.kdump.functions
+++ b/init/rc.kdump.functions
@@ -108,7 +108,7 @@ function build_kdump_commandline()
local nr_cpus=$(cpus_param "$kdump_kernel")
commandline=$(
remove_from_commandline \
- 'crashkernel|splash|mem|BOOT_IMAGE|showopts|zfcp\.allow_lun_scan|hugepages|acpi_no_memhotplug|cgroup_disable' \
+ 'root|resume|crashkernel|splash|mem|BOOT_IMAGE|showopts|zfcp\.allow_lun_scan|hugepages|acpi_no_memhotplug|cgroup_disable' \
< /proc/cmdline)
# Use deadline for saving the memory footprint
commandline="$commandline elevator=deadline sysrq=yes reset_devices acpi_no_memhotplug cgroup_disable=memory"