[memtest86+/f15/master] Deprecated nash replaceed by findfs (#671503)

[Jaroslav Škarvada]

commit b77bb504ebefb5024918c9220fd5b30357360833
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Tue Mar 15 08:56:21 2011 +0100

    Deprecated nash replaceed by findfs (#671503)

 memtest86+.spec |    5 ++++-
 new-memtest-pkg |    9 +++------
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/memtest86+.spec b/memtest86+.spec
index fec6233..0dc41a7 100644
--- a/memtest86+.spec
+++ b/memtest86+.spec
@@ -7,7 +7,7 @@
 
 Name:     memtest86+
 Version:  4.10
-Release:  4%{?dist}
+Release:  5%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Mar 15 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 4.10-5
+- Deprecated nash replaceed by findfs (#671503)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/new-memtest-pkg b/new-memtest-pkg
index 28779cc..8446b6e 100755
--- a/new-memtest-pkg
+++ b/new-memtest-pkg
@@ -107,15 +107,12 @@ install() {
 	return
     fi
 
-    # get the root filesystem to use; if it's on a label make sure it's
+    # get the root filesystem to use; if it's on a label/uuid make sure it's
     # been configured. if not, get the root device from mount
     rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)
     short=$(echo $rootdevice | cut -d= -f1)
-    if [ "$short" == "LABEL" ]; then
-	label=$(echo $rootdevice | cut -d= -f2 |head -n 1)
-	device=$(echo "showlabels" | /sbin/nash  --force --quiet | 
-			awk '$2 == "'$label'" {print $1}')
-	if [ -z "$device" ]; then
+    if [ "$short" == "LABEL" -o "$short" == "UUID" ]; then
+	if ! /sbin/findfs "$rootdevice" &> /dev/null; then
 	    rootdevice=$(mount | awk '$3 == "/" { print $1 }')
 	fi
     fi