51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
|
From 086068496508087b68029ae31a93ed5d3e4ac2cb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ankit Kumar <ankit@linux.vnet.ibm.com>
|
||
|
|
Date: Mon, 7 Aug 2017 20:35:04 +0530
|
||
|
|
Subject: [PATCH] Don't exit even if initrd is not built
|
||
|
|
|
||
|
|
References: bsc#1047781
|
||
|
|
Patch-mainline: v0.8.17
|
||
|
|
Git-commit: 086068496508087b68029ae31a93ed5d3e4ac2cb
|
||
|
|
|
||
|
|
In case where there is no change in kdump config, new initrd won't be
|
||
|
|
built. Restarting kdump.service in above case exits as initrd is same
|
||
|
|
as older. As control doesn't proceed further, it fails to enable dump
|
||
|
|
configuration.
|
||
|
|
|
||
|
|
This patch fixes above mentioned issue by proceeding further and enabling
|
||
|
|
dump configuration.
|
||
|
|
|
||
|
|
Signed-off-by: Ankit Kumar <ankit@linux.vnet.ibm.com>
|
||
|
|
Acked-by: Michal Suchanek <msuchanek@suse.de>
|
||
|
|
---
|
||
|
|
init/load.sh | 12 ++++++------
|
||
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/init/load.sh b/init/load.sh
|
||
|
|
index 4fc7a82e7199..6910bc546d9c 100755
|
||
|
|
--- a/init/load.sh
|
||
|
|
+++ b/init/load.sh
|
||
|
|
@@ -309,13 +309,13 @@ if [ "$1" = "--update" ] ; then
|
||
|
|
rebuild_kdumprd || exit 1
|
||
|
|
after=$(stat -c %Y $kdump_initrd)
|
||
|
|
|
||
|
|
- # If the initial ram disk was not updated,
|
||
|
|
- # do not execute kexec again. This script
|
||
|
|
- # is called from kdump.service and
|
||
|
|
+ # This script is called from kdump.service and
|
||
|
|
# kdump-rebuild-initrd.service.
|
||
|
|
- if [ "$before" = "$after" ] ; then
|
||
|
|
- exit 0
|
||
|
|
- fi
|
||
|
|
+ # Proceed further even if there is no change in initrd
|
||
|
|
+ # because restart kdump.service unloads kdump/fadump and
|
||
|
|
+ # in next service start below enablement will be required
|
||
|
|
+ # otherwise kdump/fadump won't be enabled and leads to panic
|
||
|
|
+ # on crash.
|
||
|
|
fi
|
||
|
|
|
||
|
|
if [ "$KDUMP_FADUMP" = "yes" ] ; then
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|