diff --git a/kdump-8712f642965d13539148e385aefb805e3464b62d b/kdump-8712f642965d13539148e385aefb805e3464b62d new file mode 100644 index 0000000..bbba806 --- /dev/null +++ b/kdump-8712f642965d13539148e385aefb805e3464b62d @@ -0,0 +1,43 @@ +# HG changeset patch +# User Bernhard Walle +# Date 1224709251 -7200 +# Node ID 8712f642965d13539148e385aefb805e3464b62d +# Parent f4cf2ef3cc3e6414d7d9386de0ebf7d633cbfed5 +Actually check -kdump before - when looking for a suitable kdump kernel + +diff -r f4cf2ef3cc3e -r 8712f642965d ChangeLog +--- a/ChangeLog Mon Aug 18 16:39:12 2008 +0200 ++++ b/ChangeLog Wed Oct 22 23:00:51 2008 +0200 +@@ -1,3 +1,8 @@ ++2008-10-22 Bernhard Walle ++ ++ * actually check -kdump before - when ++ looking for a suitable kdump kernel ++ + 2008-08-18 Bernhard Walle + + * change default location to "/var/crash" +diff -r f4cf2ef3cc3e -r 8712f642965d NEWS +--- a/NEWS Mon Aug 18 16:39:12 2008 +0200 ++++ b/NEWS Wed Oct 22 23:00:51 2008 +0200 +@@ -1,6 +1,8 @@ + 0.6.4 + ----- + * change default location for KDUMP_SAVEDIR to "/var/crash" ++ * actually check -kdump before - when looking for ++ a suitable kdump kernel + + 0.6.3 + ----- +diff -r f4cf2ef3cc3e -r 8712f642965d init/boot.kdump +--- a/init/boot.kdump Mon Aug 18 16:39:12 2008 +0200 ++++ b/init/boot.kdump Wed Oct 22 23:00:51 2008 +0200 +@@ -129,7 +129,7 @@ + local kdump_kver= + + # -kdump first +- kdump_kver=$(uname -r | sed -e's/-[^-]*$//g') ++ kdump_kver=$(uname -r | sed -e's/-[^-]*$//g')-kdump + if [ -n "$(check_boot_kernel $kdump_kver)" ] ; then + echo "$kdump_kver" + return diff --git a/kdump.changes b/kdump.changes index 6e54ed3..183879d 100644 --- a/kdump.changes +++ b/kdump.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 22 23:05:50 CEST 2008 - bwalle@suse.de + +- Actually check -kdump before - when + looking for a suitable kdump kernel. + ------------------------------------------------------------------- Fri Oct 17 16:19:27 CEST 2008 - bwalle@suse.de diff --git a/kdump.spec b/kdump.spec index 148b250..0de1026 100644 --- a/kdump.spec +++ b/kdump.spec @@ -22,7 +22,7 @@ Url: http://freehg.org/u/bwalle/kdump/ Name: kdump License: GPL v2 or later Version: 0.6.3 -Release: 30 +Release: 31 Requires: curl openssh makedumpfile Summary: Script for kdump Group: System/Kernel @@ -38,6 +38,7 @@ Source2: %{name}-%{version}-rpmlintrc Patch0: %{name}-f4cf2ef3cc3e6414d7d9386de0ebf7d633cbfed5 Patch1: %{name}-2860e7a5d481633aca345b07db28d95fdb04d649 Patch2: %{name}-8580f201f2f759eb78c646a6b98727b4508101d3 +Patch3: %{name}-8712f642965d13539148e385aefb805e3464b62d BuildRoot: %{_tmppath}/%{name}-%{version}-build # rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2) Provides: kdump-helpers = 0.2.4 @@ -62,6 +63,7 @@ Authors: %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build export CFLAGS="%optflags" @@ -130,6 +132,9 @@ rm /var/log/dump &>/dev/null || true %config %{_sysconfdir}/udev/rules.d/70-kdump.rules %changelog +* Thu Oct 23 2008 bwalle@suse.de +- Actually check -kdump before - when + looking for a suitable kdump kernel. * Fri Oct 17 2008 bwalle@suse.de - /etc/sysconfig/kdump should be only readable as root since it may contain passwords (bnc#436042).