From 64c7c7b16478681659a2b199d3bc6bb75e018fa5 Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@fedoraproject.org>
Date: Tue, 7 Apr 2009 13:57:21 +0000
Subject: [PATCH] Resolves: bz 494416

---
 kexec-tools.spec |  5 ++++-
 mkdumprd         | 16 +++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/kexec-tools.spec b/kexec-tools.spec
index a189f8a..eff383f 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -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 @@ done
 
 
 %changelog
+* Tue Apr 07 2009 Neil Horman <nhorman@redhat.com> - 2.0.0-12
+- Simplifed rootfs mounting code in mkdumprd (bz 494416)
+
 * Sun Apr 05 2009 Lubomir Rintel <lkundrak@v3.sk> - 2.0.0-11
 - Install the correct configuration for i586
 
diff --git a/mkdumprd b/mkdumprd
index d53defa..743e7e7 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -2102,19 +2102,9 @@ emit "fi"
 
 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"