rpms/kexec-tools/devel kexec-tools.spec, 1.132, 1.133 mkdumprd, 1.26, 1.27

[Neil Horman]

Author: nhorman

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

Modified Files:
	kexec-tools.spec mkdumprd 
Log Message:
Resolves: bz 494416


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- kexec-tools.spec	5 Apr 2009 12:20:13 -0000	1.132
+++ kexec-tools.spec	7 Apr 2009 13:57:21 -0000	1.133
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -243,6 +243,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-12
+- Simplifed rootfs mounting code in mkdumprd (bz 494416)
+
 * Sun Apr 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.0.0-11
 - Install the correct configuration for i586
 


Index: mkdumprd
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/mkdumprd,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mkdumprd	3 Apr 2009 20:06:29 -0000	1.26
+++ mkdumprd	7 Apr 2009 13:57:21 -0000	1.27
@@ -2102,19 +2102,9 @@
 
 emit "echo Checking root filesystem."
 emit "fsck \$ROOTDEV"
-emit "echo Mounting root filesystem."
-emit "for FSTYPE in ext3 ext2 minix"
-emit "do"
-emit "  echo Trying mount -t \$FSTYPE \$ROOTDEV /sysroot"
-emit "  mount -t \$FSTYPE \$ROOTDEV /sysroot >/dev/null 2>&1 "
-emit "  if [ \$? == 0 ]"
-emit "  then"
-emit "      echo Using \$FSTYPE on root filesystem"
-emit "      ROOT_MOUNT_GOOD=1"
-emit "      break;"
-emit "  fi"
-emit "done"
-emit "if [ -z \"\$ROOT_MOUNT_GOOD\" ]"
+emit "echo Mounting root filesystem: mount -t $rootfs \$ROOTDEV /sysroot"
+emit "mount -t $rootfs \$ROOTDEV /sysroot >/dev/null 2>&1 "
+emit "if [ \$? != 0 ]"
 emit "then"
 emit "   echo unable to mount rootfs. Dropping to shell"
 emit "   /bin/msh"