rpms/kexec-tools/devel kdump.init, 1.23, 1.24 kexec-tools.spec, 1.148, 1.149 sources, 1.20, 1.21

[Neil Horman]

Author: nhorman

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

Modified Files:
	kdump.init kexec-tools.spec sources 
Log Message:
Updating dracut files for adv conf


Index: kdump.init
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kdump.init,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- kdump.init	31 Jul 2009 14:39:28 -0000	1.23
+++ kdump.init	11 Aug 2009 20:07:22 -0000	1.24
@@ -60,7 +60,7 @@ function check_config()
 		then
 			MKDUMPRD=$DRACUT_CMD
 		else
-			MKDUMPRD="dracut -c /etc/kdump-adv-conf/initramfs.conf"
+			MKDUMPRD="dracut -f -c /etc/kdump-adv-conf/initramfs.conf"
 		fi
 		# We always rebuild here, since it takes longer
 		# to figure out if anything has changed
@@ -111,7 +111,7 @@ function check_config()
 	   [ "$kernel_time" -gt "$image_time" ]; then
 		echo "Detected $KDUMP_CONFIG_FILE or $kdump_kernel change"
 		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.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- kexec-tools.spec	29 Jul 2009 19:34:47 -0000	1.148
+++ kexec-tools.spec	11 Aug 2009 20:07:22 -0000	1.149
@@ -28,7 +28,7 @@ Source100: dracut-files.tbz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(pre): coreutils chkconfig sed zlib 
-Requires: busybox >= 1.2.0
+Requires: busybox >= 1.2.0, dracut
 BuildRequires: dash 
 BuildRequires: zlib-devel zlib zlib-static elfutils-devel-static glib2-devel 
 BuildRequires: pkgconfig intltool gettext 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	29 Jul 2009 19:34:47 -0000	1.20
+++ sources	11 Aug 2009 20:07:22 -0000	1.21
@@ -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
-95149c97537d0fb65eda72f4e53a0316  dracut-files.tbz2
+925dc7a5121fbb8eab854375d7ea4d1d  dracut-files.tbz2