From f8a7c06f05ae503cb05d5062498bbacf5e29b36d Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 5 Jul 2007 15:00:14 +0000
Subject: make sure version is detected before trying to mount usb root

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

(limited to 'rescue/Flash')

diff --git a/rescue/Flash/scripts/rescue_common b/rescue/Flash/scripts/rescue_common
index 69dc3d182..4d8a80c67 100644
--- a/rescue/Flash/scripts/rescue_common
+++ b/rescue/Flash/scripts/rescue_common
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 function detect_version() {
+    version=""
     if has_label Share; then
         version="1.0"
     elif has_label MDVUSBROOT; then
@@ -10,6 +11,8 @@ function detect_version() {
     fi
     usbroot_device=$_device
     source_version_variables
+
+    [ -n "$version" ]
 }
 
 function source_version_variables {
@@ -105,9 +108,7 @@ function insert_pendrive() {
     echo -n 'Detecting pen drive: '
 
     for ((i=0; $i <= 15 ; i++)); do
-        detect_version
-
-        nash --force > /dev/null 2>&1 <<EOF
+        detect_version && nash --force > /dev/null 2>&1 <<EOF
 mount -t vfat LABEL=$label $_tmpdir
 EOF
         if [ $? -ne 0 ]; then
-- 
cgit v1.2.1