rpms/kexec-tools/devel .cvsignore, 1.11, 1.12 Makefile, 1.8, 1.9 kdump.init, 1.21, 1.22 kexec-tools.spec, 1.147, 1.148 sources, 1.19, 1.20 mkdumprd2, 1.6, NONE mkdumprd2_functions, 1.2, NONE

[Neil Horman]

Author: nhorman

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

Modified Files:
	.cvsignore Makefile kdump.init kexec-tools.spec sources 
Removed Files:
	mkdumprd2 mkdumprd2_functions 
Log Message:
Starting mkdumprd2 -> dracut conversion


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	20 May 2009 18:09:56 -0000	1.11
+++ .cvsignore	29 Jul 2009 19:34:47 -0000	1.12
@@ -8,3 +8,4 @@ makedumpfile-1.2.6.tar.gz
 kexec-tools-2.0.0.tar.bz2
 makedumpfile-1.3.3.tar.gz
 mkdumprd2-files.tbz2
+dracut-files.tbz2


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- Makefile	6 Jul 2009 18:00:03 -0000	1.8
+++ Makefile	29 Jul 2009 19:34:47 -0000	1.9
@@ -20,14 +20,12 @@ endef
 MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
 endif
 
-mkdumprd2_tarball:
+dracut_tarball:
 	mkdir stage
-	ln -s ../kdump_build_helpers stage/kdump_build_helpers
-	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 .
+	ln -s ../kdump_dracut_modules stage/kdump_dracut_modules
+	tar -C stage -j -h -c --exclude=CVS -f ./dracut-files.tbz2 .
 	rm -rf stage
 
 include $(MAKEFILE_COMMON)


Index: kdump.init
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kdump.init,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- kdump.init	6 Jul 2009 18:39:27 -0000	1.21
+++ kdump.init	29 Jul 2009 19:34:47 -0000	1.22
@@ -53,15 +53,20 @@ function save_core()
 
 function check_config()
 {
-	if [ -f /etc/kdump-adv-conf ]
+	if [ -f /etc/kdump-adv-conf/initramfs.conf ]
 	then
 		$LOGGER "Using Kdump advanced configuration service"
-		MKDUMPRD=/sbin/mkdumprd2
+		if [ -n "DRACUT_CMD" ]
+		then
+			MKDUMPRD=$DRACUT_CMD
+		else
+			MKDUMPRD="dracut -c /etc/kdump-adv-conf/initramfs.conf"
+		fi
 		# We always rebuild here, since it takes longer
 		# to figure out if anything has changed
 		touch /etc/kdump.conf
 	else
-		MKDUMPRD=/sbin/mkdumprd
+		MKDUMPRD="/sbin/mkdumprd -d -f"
 	fi
 
 	if [ -z "$KDUMP_KERNELVER" ]; then
@@ -84,7 +89,7 @@ function check_config()
 	if [ ! -f $kdump_initrd ]; then
 		echo  -n "No kdump initial ramdisk found."; warning; echo
 		echo "Rebuilding $kdump_initrd"
-		$MKDUMPRD -d -f $kdump_initrd $kdump_kver
+		$MKDUMPRD $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.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- kexec-tools.spec	25 Jul 2009 04:33:33 -0000	1.147
+++ kexec-tools.spec	29 Jul 2009 19:34:47 -0000	1.148
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -24,8 +24,7 @@ Source14: 98-kexec.rules
 # These are sources for mkdumprd2
 # Which is currently in development
 #######################################
-Source100: mkdumprd2-files.tbz2
-Source101: mkdumprd2
+Source100: dracut-files.tbz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(pre): coreutils chkconfig sed zlib 
@@ -148,10 +147,13 @@ install -m 755 makedumpfile-1.3.3/makedu
 make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
-# untar the mkdumprd2 package
+# untar the dracut package
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf
 tar -C $RPM_BUILD_ROOT/etc/kdump-adv-conf -jxvf %{SOURCE100}
-install -m 755 %{SOURCE101} $RPM_BUILD_ROOT/sbin
+
+#and move the custom dracut modules to the dracut directory
+mkdir -p $RPM_BUILD_ROOT/usr/share/dracut/modules.d/
+mv $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/* $RPM_BUILD_ROOT/usr/share/dracut/modules.d/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -245,13 +247,11 @@ done
 %{_datadir}/kdump
 %config(noreplace,missingok) %{_sysconfdir}/sysconfig/kdump
 %config(noreplace,missingok) %{_sysconfdir}/kdump.conf
-%{_sysconfdir}/kdump-adv-conf/kdump_build_helpers/
-%{_sysconfdir}/kdump-adv-conf/kdump_runtime_helpers/
 %{_sysconfdir}/kdump-adv-conf/kdump_initscripts/
 %{_sysconfdir}/kdump-adv-conf/kdump_sample_manifests/
-%{_sysconfdir}/kdump-adv-conf/mkdumprd2_functions
 %config %{_sysconfdir}/rc.d/init.d/kdump
 %config %{_sysconfdir}/udev/rules.d/*
+%{_datadir}/dracut/modules.d/*
 %dir %{_localstatedir}/crash
 %{_mandir}/man8/*
 %doc News
@@ -261,6 +261,9 @@ done
 
 
 %changelog
+* Wed Jul 29 2009 Neil Horman <nhorman at redhat.com> - 2.0,0-23
+- Remove mkdumprd2 and start replacement with dracut
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	6 Jul 2009 18:00:03 -0000	1.19
+++ sources	29 Jul 2009 19:34:47 -0000	1.20
@@ -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
-482347c1f6fcb2480044c42c03a16b9f  mkdumprd2-files.tbz2
+95149c97537d0fb65eda72f4e53a0316  dracut-files.tbz2


--- mkdumprd2 DELETED ---


--- mkdumprd2_functions DELETED ---