diff --git a/initrd_network.patch b/kdump-initrd-network.patch similarity index 72% rename from initrd_network.patch rename to kdump-initrd-network.patch index 039ba21..89c9d84 100644 --- a/initrd_network.patch +++ b/kdump-initrd-network.patch @@ -1,6 +1,16 @@ ---- init/mkdumprd.old 2014-03-04 17:51:17.000000000 +0100 -+++ init/mkdumprd 2014-03-05 17:57:07.606638345 +0100 -@@ -123,6 +123,26 @@ +From: Julian Wolf +Subject: Added dracut network activation in initrd to mkdumprd +Patch-mainline: not yet + +Acked-by: Petr Tesarik + +--- + init/mkdumprd | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +--- a/init/mkdumprd ++++ b/init/mkdumprd +@@ -123,6 +123,26 @@ function run_dracut() DRACUT_ARGS="--force --hostonly --omit 'systemd plymouth resume usrmount'" diff --git a/kdump-ledblink-background.patch b/kdump-ledblink-background.patch new file mode 100644 index 0000000..4db0df0 --- /dev/null +++ b/kdump-ledblink-background.patch @@ -0,0 +1,25 @@ +From: Julian Wolf +Subject: Fixed wrong argument for ledblink. +Patch-mainline: not yet + +There is no --background option for kdumptool ledblink. + +Signed-off-by: Petr Tesarik + +--- + init/save_dump.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/init/save_dump.sh ++++ b/init/save_dump.sh +@@ -143,8 +143,8 @@ FADUMP_ENABLED=/sys/kernel/fadump_enable + FADUMP_RELEASE_MEM=/sys/kernel/fadump_release_mem + + # +-# start LED blinking in background +-kdumptool ledblink --background ++# start LED blinking ++kdumptool ledblink & + + # + # create core dumps by default here for kdumptool debugging diff --git a/kdump.changes b/kdump.changes index 1000c6c..3eec18f 100644 --- a/kdump.changes +++ b/kdump.changes @@ -1,14 +1,19 @@ +------------------------------------------------------------------- +Fri Mar 14 07:21:41 UTC 2014 - ptesarik@suse.cz + +- kdump-ledblink-background.patch: Run kdumptool in the background. + ------------------------------------------------------------------- Wed Mar 5 16:58:02 UTC 2014 - juwolf@suse.com -- Added dracut network activation in initrd to mkdumprd. - Patch added: initrd_network.patch +- kdump-initrd-network.patch: Added dracut network activation in + initrd to mkdumprd. ------------------------------------------------------------------- Tue Mar 4 12:19:24 UTC 2014 - juwolf@suse.com -- Fixed wrong argument for ledblink - ledblink_background.patch: Added +- kdump-ledblink-background.patch: Fixed wrong argument for + ledblink. ------------------------------------------------------------------- Sun Mar 2 15:35:11 UTC 2014 - ptesarik@suse.cz diff --git a/kdump.spec b/kdump.spec index a24a88a..8a54ec2 100644 --- a/kdump.spec +++ b/kdump.spec @@ -49,8 +49,8 @@ PreReq: %insserv_prereq %fillup_prereq mkinitrd Source: %{name}-%{version}.tar.bz2 Source2: %{name}-%{version}-rpmlintrc Source3: kdump.service -Patch1: ledblink_background.patch -Patch2: initrd_network.patch +Patch1: %{name}-ledblink-background.patch +Patch2: %{name}-initrd-network.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2) Provides: kdump-helpers = %{version} diff --git a/ledblink_background.patch b/ledblink_background.patch deleted file mode 100644 index c7c672b..0000000 --- a/ledblink_background.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- init/save_dump.sh.old 2014-03-04 12:44:06.595720000 +0100 -+++ init/save_dump.sh 2014-03-04 12:44:19.444960000 +0100 -@@ -143,8 +143,8 @@ - FADUMP_RELEASE_MEM=/sys/kernel/fadump_release_mem - - # --# start LED blinking in background --kdumptool ledblink --background -+# start LED blinking -+kdumptool ledblink - - # - # create core dumps by default here for kdumptool debugging