rpms/kexec-tools/devel kdump.init, 1.20, 1.21 kexec-tools.spec, 1.142, 1.143 mkdumprd2, 1.5, 1.6

[Neil Horman]

Author: nhorman

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

Modified Files:
	kdump.init kexec-tools.spec mkdumprd2 
Log Message:
Updating mkdumprd2


Index: kdump.init
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kdump.init,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- kdump.init	6 Jul 2009 18:00:03 -0000	1.20
+++ kdump.init	6 Jul 2009 18:39:27 -0000	1.21
@@ -57,6 +57,9 @@ function check_config()
 	then
 		$LOGGER "Using Kdump advanced configuration service"
 		MKDUMPRD=/sbin/mkdumprd2
+		# We always rebuild here, since it takes longer
+		# to figure out if anything has changed
+		touch /etc/kdump.conf
 	else
 		MKDUMPRD=/sbin/mkdumprd
 	fi


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- kexec-tools.spec	6 Jul 2009 18:00:03 -0000	1.142
+++ kexec-tools.spec	6 Jul 2009 18:39:27 -0000	1.143
@@ -263,6 +263,7 @@ done
 - Updated initscript to use mkdumprd2 if manifest is present
 - Updated spec to require dash
 - Updated sample manifest to point to correct initscript
+- Updated populate_std_files helper to fix sh symlink
 
 * Mon Jul 06 2009 Neil Horman <nhorman at redhat.com> 2.0.0-17
 - Fixed mkdumprd2 tarball creation


Index: mkdumprd2
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/mkdumprd2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mkdumprd2	19 May 2009 20:08:18 -0000	1.5
+++ mkdumprd2	6 Jul 2009 18:39:27 -0000	1.6
@@ -311,9 +311,9 @@ create_initramfs_image()
 		cleanup_and_exit 1 " Could not create initramfs"
 	fi
 
-	# Get running kernel version to name the initramfs with
-	target=$(uname -r)
-	gzip -9 -c $IMG_FILE > ./initrd-$target.img
+	# argument 1 is passed in and is the full path to the
+	# output initramfs name 
+	gzip -9 -c $IMG_FILE > $1 
 }
 
 
@@ -322,6 +322,17 @@ create_initramfs_image()
 ##########################################################
 
 # Get our passed in options
+INITRAMFS_NAME=$1
+
+#validate the options
+if [ -z "INITRAMFS_NAME" ]
+then
+	cleanup_and_exit 1 "Need an initramfs name"
+fi
+
+
+export INITRAMFS_NAME
+export KERNEL_NAME
 
 #setup working env
 setup_env
@@ -341,7 +352,7 @@ prep_std_initramfs
 populate_from_manifest
 
 # Do image file creation
-create_initramfs_image
+create_initramfs_image $INITRAMFS_NAME
 
 # Cleanup
 cleanup_and_exit 0 ""