Hello community,
here is the log from the commit of package kdump
checked in at Mon Jun 23 01:01:59 CEST 2008.
--------
--- kdump/kdump.changes 2008-06-01 18:04:41.000000000 +0200
+++ kdump/kdump.changes 2008-06-22 21:51:27.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Jun 13 17:34:43 CEST 2008 - bwalle@suse.de
+
+- update to 0.3.4
+ o try also $(uname -i) to find the makedumpfile.config in
+ /usr/src/linux-${version}-obj/${arch}/${flavour}
+ o filter "mem" kernel parameter before loading the kdump kernel
+ (bnc#393324)
+- delete kdump-clarify-README: merged in new version
+- delete kdump-default-nmi: merged in new version
+- delete kdump-reload-memory-hotplug: merged in new version
+- delete kdump-fix-kernel-detection: merged in new version
+
+-------------------------------------------------------------------
Old:
----
kdump-0.3.3.tar.bz2
kdump-clarify-README
kdump-default-nmi
kdump-fix-kernel-detection
kdump-reload-memory-hotplug
New:
----
kdump-0.3.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdump.spec ++++++
--- /var/tmp/diff_new_pack.wL4954/_old 2008-06-23 01:01:45.000000000 +0200
+++ /var/tmp/diff_new_pack.wL4954/_new 2008-06-23 01:01:45.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdump (Version 0.3.3)
+# spec file for package kdump (Version 0.3.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,8 +14,8 @@
Name: kdump
License: GPL v2 or later
BuildRequires: libelf0-devel zlib-devel
-Version: 0.3.3
-Release: 31
+Version: 0.3.4
+Release: 1
Requires: curl openssh
Recommends: makedumpfile
Summary: Script for kdump
@@ -26,10 +26,6 @@
Url: http://www.suse.de/~bwalle/kdump-helpers/
Source: %{name}-%{version}.tar.bz2
Source1: 02-keyboard-blink.sh
-Patch0: %{name}-clarify-README
-Patch1: kdump-default-nmi
-Patch2: kdump-reload-memory-hotplug
-Patch3: kdump-fix-kernel-detection
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2)
Provides: kdump-helpers = 0.2.4
@@ -51,10 +47,6 @@
%prep
%setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
make CFLAGS="$RPM_OPT_FLAGS"
@@ -149,6 +141,16 @@
%{_sysconfdir}/udev/rules.d/70-kdump.rules
%changelog
+* Fri Jun 13 2008 bwalle@suse.de
+- update to 0.3.4
+ o try also $(uname -i) to find the makedumpfile.config in
+ /usr/src/linux-${version}-obj/${arch}/${flavour}
+ o filter "mem" kernel parameter before loading the kdump kernel
+ (bnc#393324)
+- delete kdump-clarify-README: merged in new version
+- delete kdump-default-nmi: merged in new version
+- delete kdump-reload-memory-hotplug: merged in new version
+- delete kdump-fix-kernel-detection: merged in new version
* Sun Jun 01 2008 bwalle@suse.de
- set KDUMP_KERNELVER="" on i386 instead of KDUMP_KERNELVER="kdump"
(with "kdump", the kdump kernel cannot be loaded without manually
++++++ kdump-0.3.3.tar.bz2 -> kdump-0.3.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdump-0.3.3/ChangeLog new/kdump-0.3.4/ChangeLog
--- old/kdump-0.3.3/ChangeLog 2008-02-20 11:47:23.000000000 +0100
+++ new/kdump-0.3.4/ChangeLog 2008-06-13 17:33:17.000000000 +0200
@@ -1,3 +1,37 @@
+2008-06-13 Bernhard Walle
+
+ * try also $(uname -i) to find the makedumpfile.config in
+ /usr/src/linux-${version}-obj/${arch}/${flavour}
+ (Novell Bugzilla #396136)
+ * filter "mem" kernel parameter before loading the kdump kernel
+ (Novell Bugzilla #393324)
+ * update version to 0.3.4
+
+2008-27-05 Bernhard Walle
+
+ * fix load of kdump kernel when KDUMP_KERNELVER="kdump" on ppc64
+ (Novell Bugzilla #394216)
+
+2008-05-20 Bernhard Walle
+
+ * fix typo when checking the result of kdump_kernel_loaded
+
+2008-05-19 Bernhard Walle
+
+ * set panic_on_unrecovered_nmi as default (Novell Bugzilla #388736)
+ * print the stderr output of the kexec invocation because it may contain
+ useful warning information that should be always shown to the user.
+ (Novell Bugzilla #374185)
+ * implement "try-restart" command and use that implementation also for
+ "condrestart"
+ * add udev rules to reload kdump configuration on memory or CPU hotplug
+ (Novell Bugzilla #389658)
+
+2008-04-18 Bernhard Walle
+
+ * clarified README that memory sizes are only recommended values
+ (Novell Bugzilla #380577)
+
2008-02-20 Bernhard Walle
* use "-o NumberOfPasswordPrompts=0 -o CheckHostIP=no -o
@@ -7,7 +41,7 @@
* require "$network" in init script so than when runlevel 3
is set in /etc/sysconfig/kdump, network is available to the
kdump scripts (Novell Bugzilla #293171)
- * update version to 0.2.3
+ * update version to 0.3.3
2008-01-08 Bernhard Walle
@@ -97,3 +131,6 @@
2007-01-15 Bernhard Walle
* initial package
+
+
+vim: set ts=8 sw=8 noet:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdump-0.3.3/init/kdump new/kdump-0.3.4/init/kdump
--- old/kdump-0.3.3/init/kdump 2008-02-20 11:46:15.000000000 +0100
+++ new/kdump-0.3.4/init/kdump 2008-06-13 17:30:41.000000000 +0200
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
#
# Copyright 2005 Red Hat, Inc.
# Author: Jeff Moyer
@@ -36,6 +36,25 @@
BOOTDIR="/boot"
+#
+# Checks if currently a kdump kernel is loaded.
+#
+# Returns: 0 (true) if a kdump kernel is loaded,
+# 1 (false) if the kdump kernel is not loaded and
+# -1 (false) if the feature is not implemented (too old kernel)
+kdump_kernel_loaded()
+{
+ if [ -r /sys/kernel/kexec_crash_loaded ]; then
+ if [ "$(cat /sys/kernel/kexec_crash_loaded)" = "1" ]; then
+ return 0
+ else
+ return 1
+ fi
+ else
+ return -1
+ fi
+}
+
# The default dumper
#
# Clean up old stuff if necessary, check the free size
@@ -69,7 +88,7 @@
# if it doesn't contain 'kdump' in the name,
# check for relocatability
- if [[ $(basename "$kernel") == *kdump* ]] &&
+ if [[ $(basename "$kernel") != *kdump* ]] &&
! $KDUMP_IDENTIFY_KERNEL -r $kstr &>/dev/null ; then
return 1
fi
@@ -168,7 +187,8 @@
KDUMP_COMMANDLINE=`cat /proc/cmdline | \
sed -e 's/crashkernel=[0-9]\+[mM]\(@[0-9]\+[Mm]\?\)\?//g' \
-e 's/ *splash=[^ ]*/ /g' \
- -e 's/ *BOOT_IMAGE=[^ ]* / /g' \
+ -e 's/ *mem=[^ ]*/ /g' \
+ -e 's/ *BOOT_IMAGE=[^ ]* / /g' \
-e 's/ *showopts/ /g'`
# Use deadline for saving the memory footprint
KDUMP_COMMANDLINE="$KDUMP_COMMANDLINE elevator=deadline sysrq=1 reset_devices"
@@ -211,11 +231,17 @@
result=$(eval "$KEXEC_CALL" 2>&1)
rc_check
+ # print stderr in any case to show warnings that normally
+ # would be supressed (bnc#374185)
+ echo "$result"
+
if rc_status ; then
- result="Success"
echo 1 > /proc/sys/kernel/panic_on_oops
- else
- echo $result
+
+ # does not exist on all architectures (only i386/x86_64)
+ if [ -f /proc/sys/kernel/unknown_nmi_panic ] ; then
+ echo 1 > /proc/sys/kernel/unknown_nmi_panic
+ fi
fi
if [ $(($KDUMP_VERBOSE & 4)) -gt 0 ] ; then
@@ -223,7 +249,7 @@
fi
if [ $(($KDUMP_VERBOSE & 1)) -gt 0 ] ; then
if rc_status ; then
- logger -i -t kdump "Loaded kdump kernel: $KEXEC_CALL"
+ logger -i -t kdump "Loaded kdump kernel: $KEXEC_CALL, Result: $result"
else
logger -i -t kdump \
"FAILED to load kdump kernel: $KEXEC_CALL, Result: $result"
@@ -300,24 +326,27 @@
fi
;;
status)
- if [ -r /sys/kernel/kexec_crash_loaded ]; then
- if [ "$(cat /sys/kernel/kexec_crash_loaded)" = "1" ]; then
- echo "kdump kernel loaded"
- else
- echo "kdump kernel not loaded"
- fi
- else
- echo "not implemented"
- fi
+ kdump_kernel_loaded
+ case $? in
+ 0) echo "kdump kernel loaded" ;;
+ 1) echo "kdump kernel not loaded" ;;
+ -1) echo "not implemented" ;;
+ esac
;;
restart|reload)
$0 stop
$0 start
;;
- condrestart)
+ condrestart|try-restart)
+ if kdump_kernel_loaded ; then
+ $0 start
+ else
+ rc_reset
+ fi
+ rc_status
;;
*)
- echo $"Usage: $0 {start|stop|status|restart|reload}"
+ echo $"Usage: $0 {start|stop|status|restart|reload|try-reload}"
exit 1
esac
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdump-0.3.3/Makefile new/kdump-0.3.4/Makefile
--- old/kdump-0.3.3/Makefile 2007-10-11 14:57:46.000000000 +0200
+++ new/kdump-0.3.4/Makefile 2008-05-19 20:43:47.000000000 +0200
@@ -30,6 +30,7 @@
make -C init install
make -C gdb install
make -C config install
+ make -C udev install
clean:
make -C src clean
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdump-0.3.3/README new/kdump-0.3.4/README
--- old/kdump-0.3.3/README 2007-10-11 14:57:46.000000000 +0200
+++ new/kdump-0.3.4/README 2008-04-18 18:37:22.000000000 +0200
@@ -80,6 +80,13 @@
ia64: crashkernel=512M (on small machines use 256M)
ppc64: crashkernel=128M@32M
+NOTE: The memory sizes are only "recommended". It really depends on the amount
+of memory and number of CPUs/nodes of the system how much memory will be needed
+in the caputure kernel to boot the kdump system and to take the dump.
+Therefore, if the kdump capture system doesn't come up, try to increase the
+memory size. Powers of two (2^n) are *not* necessary but the "natural" choice
+for memory sizes.
+
After setting the boot loader option, activate the Kdump init script, which is
not activated by default. To do this, use the YaST System Services (Runlevel)
module. Alternately, enable the service on the command line with the following
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdump-0.3.3/scripts/kdump-cat_progress new/kdump-0.3.4/scripts/kdump-cat_progress
--- old/kdump-0.3.3/scripts/kdump-cat_progress 2008-02-20 11:47:23.000000000 +0100
+++ new/kdump-0.3.4/scripts/kdump-cat_progress 2008-06-13 17:33:17.000000000 +0200
@@ -19,7 +19,7 @@
use Getopt::Long;
-my $VERSION = "0.3.3";
+my $VERSION = "0.3.4";
my $BLOCKSIZE = 1024;
my $PROGRESS_INTERVAL = 1; # seconds
my $PROGRESS_LOOPS = 50;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdump-0.3.3/scripts/kdump-copy_progress new/kdump-0.3.4/scripts/kdump-copy_progress
--- old/kdump-0.3.3/scripts/kdump-copy_progress 2008-02-20 11:47:23.000000000 +0100
+++ new/kdump-0.3.4/scripts/kdump-copy_progress 2008-06-13 17:33:17.000000000 +0200
@@ -20,7 +20,7 @@
use POSIX ":sys_wait_h";
use Getopt::Long;
-my $VERSION = "0.3.3";
+my $VERSION = "0.3.4";
###############################################################################
# Outputs usage information
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdump-0.3.3/scripts/kdump-save_dump new/kdump-0.3.4/scripts/kdump-save_dump
--- old/kdump-0.3.3/scripts/kdump-save_dump 2008-02-20 11:46:15.000000000 +0100
+++ new/kdump-0.3.4/scripts/kdump-save_dump 2008-06-13 17:25:39.000000000 +0200
@@ -100,16 +100,18 @@
{
local version=$(get_kernel_version_dump)
local flavor=$(echo $version | sed -e 's#^.*-##')
- local arch=$(uname -m)
local version_without_flavor=$(echo $version | sed -e "s#-$flavor##")
- local dir=/usr/src/linux-${version_without_flavor}-obj/${arch}/${flavor}/
- if [ -r $dir/makedumpfile.config ] ; then
- echo $dir/makedumpfile.config
- return 0
- else
- return 1
- fi
+ for arch in $(uname -im) ; do
+ local dir=/usr/src/linux-${version_without_flavor}-obj/${arch}/${flavor}/
+
+ if [ -r $dir/makedumpfile.config ] ; then
+ echo $dir/makedumpfile.config
+ return 0
+ else
+ return 1
+ fi
+ done
}
###############################################################################
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdump-0.3.3/scripts/kdump-url_parser new/kdump-0.3.4/scripts/kdump-url_parser
--- old/kdump-0.3.3/scripts/kdump-url_parser 2008-02-20 11:47:23.000000000 +0100
+++ new/kdump-0.3.4/scripts/kdump-url_parser 2008-06-13 17:33:17.000000000 +0200
@@ -19,7 +19,7 @@
use Getopt::Long;
-my $VERSION = "0.3.3";
+my $VERSION = "0.3.4";
my %ALIASES = (
'smb' => 'cifs',
'scp' => 'ssh'
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdump-0.3.3/udev/70-kdump.rules new/kdump-0.3.4/udev/70-kdump.rules
--- old/kdump-0.3.3/udev/70-kdump.rules 1970-01-01 01:00:00.000000000 +0100
+++ new/kdump-0.3.4/udev/70-kdump.rules 2008-05-19 20:43:47.000000000 +0200
@@ -0,0 +1,12 @@
+#
+# Kdump core headers needs to be regnerated if the CPUs or memory changes.
+# For this, reload kdump.
+#
+# Novell Bug #389658
+#
+
+SUBSYSTEM=="cpu", ACTION=="online", PROGRAM="/etc/init.d/kdump try-restart"
+SUBSYSTEM=="cpu", ACTION=="offline", PROGRAM="/etc/init.d/kdump try-restart"
+SUBSYSTEM=="memory", ACTION=="add", PROGRAM="/etc/init.d/kdump try-restart"
+SUBSYSTEM=="memory", ACTION=="remove", PROGRAM="/etc/init.d/kdump try-restart"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdump-0.3.3/udev/Makefile new/kdump-0.3.4/udev/Makefile
--- old/kdump-0.3.3/udev/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ new/kdump-0.3.4/udev/Makefile 2008-05-19 20:43:47.000000000 +0200
@@ -0,0 +1,9 @@
+# Simple makefile to build kdump-helper
+#
+# (c) 2008, Bernhard Walle , SUSE LINUX Products GmbH
+
+
+install:
+ mkdir -p $(DESTDIR)$(SYSCONFDIR)/udev/rules.d
+ install -m 0644 70-kdump.rules $(DESTDIR)$(SYSCONFDIR)/udev/rules.d
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdump-0.3.3/.version new/kdump-0.3.4/.version
--- old/kdump-0.3.3/.version 2008-02-20 11:47:23.000000000 +0100
+++ new/kdump-0.3.4/.version 2008-06-13 17:33:17.000000000 +0200
@@ -1 +1 @@
-0.3.3
\ No newline at end of file
+0.3.4
\ No newline at end of file
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org