rpms/kexec-tools/devel Makefile, 1.7, 1.8 kdump.init, 1.19, 1.20 kexec-tools.spec, 1.141, 1.142 sources, 1.18, 1.19 kdumpinit.rootfs, 1.1, NONE

[Neil Horman]

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9429

Modified Files:
	Makefile kdump.init kexec-tools.spec sources 
Removed Files:
	kdumpinit.rootfs 
Log Message:
Updating mkdumprd2 files


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- Makefile	6 Jul 2009 16:47:16 -0000	1.7
+++ Makefile	6 Jul 2009 18:00:03 -0000	1.8
@@ -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
 


Index: kdump.init
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kdump.init,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- kdump.init	2 Jan 2008 15:39:15 -0000	1.19
+++ kdump.init	6 Jul 2009 18:00:03 -0000	1.20
@@ -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"


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- kexec-tools.spec	6 Jul 2009 16:47:17 -0000	1.141
+++ kexec-tools.spec	6 Jul 2009 18:00:03 -0000	1.142
@@ -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
 %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 at 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 at redhat.com> 2.0.0-17
 - Fixed mkdumprd2 tarball creation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	6 Jul 2009 16:47:17 -0000	1.18
+++ sources	6 Jul 2009 18:00:03 -0000	1.19
@@ -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


--- kdumpinit.rootfs DELETED ---