From 455a658df06e5a3c92f00ea54aaf4446d026683d Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 5 Jul 2007 14:54:43 +0000
Subject: detect partition device when looking for label (and remember it as
 "usbroot_device")

---
 rescue/Flash/scripts/rescue_common | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'rescue')

diff --git a/rescue/Flash/scripts/rescue_common b/rescue/Flash/scripts/rescue_common
index 97f25385d..f8e657d72 100644
--- a/rescue/Flash/scripts/rescue_common
+++ b/rescue/Flash/scripts/rescue_common
@@ -8,6 +8,7 @@ function detect_version() {
     elif has_label MDV_FLASH; then
         version="2.0"
     fi
+    usbroot_device=$_device
 }
 
 function has_label() {
@@ -24,6 +25,9 @@ EOF
 
     rc=$?
 
+    _device=`perl -ne 'my @l = split; $l[1] eq "'$_tmpdir'" and print "$l[0]\n"' /proc/mounts`
+    [ -z "$_device" ] && rc=1
+
     umount $_tmpdir 2> /dev/null
     rmdir $_tmpdir 2> /dev/null
 
-- 
cgit v1.2.1