Updating mkdumprd2 files

Makefile

@@ -26,6 +26,7 @@ mkdumprd2_tarball:
 	ln -s ../kdump_runtime_helpers stage/kdump_runtime_helpers
 	ln -s ../kdump_initscripts stage/kdump_initscripts
 	ln -s ../kdump_sample_manifests stage/kdump_sample_manifests
+	ln -s ../mkdumprd2_functions stage/mkdumprd2_functions
 	tar -C stage -j -h -c --exclude=CVS -f ./mkdumprd2-files.tbz2 .
 	rm -rf stage
 

kdump.init

@@ -53,6 +53,14 @@ function save_core()
 
 function check_config()
 {
+	if [ -f /etc/kdump-adv-conf ]
+	then
+		$LOGGER "Using Kdump advanced configuration service"
+		MKDUMPRD=/sbin/mkdumprd2
+	else
+		MKDUMPRD=/sbin/mkdumprd
+	fi
+
 	if [ -z "$KDUMP_KERNELVER" ]; then
 		local running_kernel=`uname -r`
 
@@ -73,7 +81,7 @@ function check_config()
 	if [ ! -f $kdump_initrd ]; then
 		echo  -n "No kdump initial ramdisk found."; warning; echo
 		echo "Rebuilding $kdump_initrd"
-		/sbin/mkdumprd -d -f $kdump_initrd $kdump_kver
+		$MKDUMPRD -d -f $kdump_initrd $kdump_kver
 		if [ $? != 0 ]; then
 			echo "Failed to run mkdumprd"
 			$LOGGER "mkdumprd: failed to make kdump initrd"
@@ -95,7 +103,7 @@ function check_config()
 	   [ "$kernel_time" -gt "$image_time" ]; then
 		echo "Detected $KDUMP_CONFIG_FILE or $kdump_kernel change"
 		echo "Rebuilding $kdump_initrd"
-		/sbin/mkdumprd -d -f $kdump_initrd $kdump_kver
+		$MKDUMPRD -d -f $kdump_initrd $kdump_kver
 		if [ $? != 0 ]; then
 			echo "Failed to run mkdumprd"
 			$LOGGER "mkdumprd: failed to make kdump initrd"

kdump_sample_manifests/manifest.localrootfs

@@ -84,4 +84,4 @@ creg /etc/clock /etc
 # rootfs
 ###################################################
 #
-ren	/usr/share/kexec-tools/kdumpinit.rootfs	/init
+ren	/etc/kdump-adv-conf/kdump_initscripts/kdumpinit.rootfs	/init

kdumpinit.rootfs

@@ -1,19 +0,0 @@
-#!/bin/msh
-
-##############################################################
-# This is the default init script for our initramfs
-# It does the following:
-# 1) loads all the available modules
-# 2) Waits for any critical disks
-# 3) starts lvm/mdraid if needed
-# 4) mounts the rootfs under /mnt/
-# 5) copies /proc/vmcore to /mnt/var/crash/<date>/vmcore
-# 6) reboots the system
-##############################################################
-
-
-# Set the path to something sane
-export PATH=/sbin:/bin
-
-load_available_modules
-

kexec-tools.spec

@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -30,7 +30,7 @@ Source101: mkdumprd2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(pre): coreutils chkconfig sed zlib 
 Requires: busybox >= 1.2.0
-BuildRequires: glibc-static
+BuildRequires: dash 
 BuildRequires: zlib-devel zlib zlib-static elfutils-devel-static glib2-devel 
 BuildRequires: pkgconfig intltool gettext 
 %ifarch %{ix86} x86_64 ppc64 ia64 ppc
@@ -107,7 +107,9 @@ export CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2"
 %endif
     --sbindir=/sbin
 rm -f kexec-tools.spec.in
+# setup the docs
 cp %{SOURCE10} . 
+
 make
 %ifarch %{ix86} x86_64 ia64 ppc64
 make -C makedumpfile-1.3.3
@@ -253,9 +255,15 @@ done
 %doc COPYING
 %doc TODO
 %doc kexec-kdump-howto.txt
+%doc kdumpinit.rootfs
 
 
 %changelog
+* Mon Jul 06 2009 Neil Horman <nhorman@redhat.com> 2.0.0-18
+- Updated initscript to use mkdumprd2 if manifest is present
+- Updated spec to require dash
+- Updated sample manifest to point to correct initscript
+
 * Mon Jul 06 2009 Neil Horman <nhorman@redhat.com> 2.0.0-17
 - Fixed mkdumprd2 tarball creation
 

sources

@@ -1,4 +1,4 @@
 d9f2ecd3c3307905f24130a25816e6cc  kexec-tools-2.0.0.tar.bz2
 3e802d638dce0080b910f15908c04a24  kexec-tools-po.tar.gz
 190f8878aa7e7b63a96fde5d59538eec  makedumpfile-1.3.3.tar.gz
-9ea9cb5a56ff436a585d1cb5340a2f05  mkdumprd2-files.tbz2
+482347c1f6fcb2480044c42c03a16b9f  mkdumprd2-files.tbz2