This email list is read-only.  Emails sent to this list will be discarded
----------------------------------
 debian/changelog                   |    5 ++-
 platforms/common-yum/initramfs/usb |   60 ++++++++++++++++++++++++------------
 2 files changed, 43 insertions(+), 22 deletions(-)

New commits:
commit 478c46346a78289aba4b903c326670932b934f64
Author: Prajwal Mohan <[EMAIL PROTECTED]>
Date:   Mon Nov 24 12:26:23 2008 -0800

    Changing USB script to accomodate boothing through KVM/QEMU


Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index b775489..abe4159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,9 +15,10 @@ moblin-image-creator (0.48) gaston; urgency=low
   * Adding mount in install script
   * Should be using bzImage for nand and not vmlinuz
   * Adding command line options to add repos to yum targets
-  * Changing Nand cmd line 
+  * Changing Nand cmd line
+  * Changing USB script to accomodate booting through KVM/QEMU 
 
- -- Prajwal Mohan <[EMAIL PROTECTED]>  Fri, 21 Nov 2008 15:49:04 -0800
+ -- Prajwal Mohan <[EMAIL PROTECTED]>  Mon, 24 Nov 2008 12:25:40 -0800
 
 moblin-image-creator (0.47) gaston; urgency=low
 
diff --git a/platforms/common-yum/initramfs/usb 
b/platforms/common-yum/initramfs/usb
index 89feef1..18dcb11 100755
--- a/platforms/common-yum/initramfs/usb
+++ b/platforms/common-yum/initramfs/usb
@@ -18,31 +18,51 @@ mountroot ()
     # Find the USB flash drive 
     while true
     do
-      for device in 'sda' 'sdb' 'sdc' 'sdd'; do
-        echo "checking device /dev/${device} for installation source..."
-       mdev -s
-        if [ -e /sys/block/${device}/removable ]; then
-           if [ "$(cat /sys/block/${device}/removable)" = "1" ]; then
-              echo "Found Removable drive at /dev/${device}"
-              mount /dev/${device}  /mnt
-              if [ -f /mnt/rootfs.img ] ; then
-                 echo "Found Boot drive at /dev/${device}"             
-                 found="yes"
+      for try in '1' '2' '3'; do
+         for device in 'sda' 'sdb' 'sdc' 'sdd'; do
+           echo "checking device /dev/${device} for installation source..."
+          mdev -s
+           if [ -e /sys/block/${device}/removable ]; then
+              if [ "$(cat /sys/block/${device}/removable)" = "1" ]; then
+                 echo "Found Removable drive at /dev/${device}"
+                 mount /dev/${device}  /mnt
+                 if [ -f /mnt/rootfs.img ] ; then
+                    echo "Found Boot drive at /dev/${device}"          
+                    found="yes"
+                 fi
+                 umount /dev/${device}
+                 if [ "$found" = "yes" ]; then
+                    break;
+                 fi          
+                 echo "/dev/${device} does not contain a rootfs"
               fi
-              umount /dev/${device}
-              if [ "$found" = "yes" ]; then
-                 break;
-              fi             
-              echo "/dev/${device} does not contain a rootfs"
-           fi
+            fi
+         done
+         if [ "$found" = "yes" ]; then
+          break;
+         fi
+         echo "Sleeping for 5 seconds"
+         /bin/sleep 5
+         echo "Sleeping finished"
+      done
+      echo "Trying non-removable drives"
+      /bin/sleep 5
+      for device in 'sda' 'sdb' 'sdc' 'sdd'; do
+         echo "checking device /dev/${device} for installation source..."
+         mount /dev/${device}  /mnt
+         if [ -f /mnt/rootfs.img ] ; then
+            echo "Found Boot drive at /dev/${device}"          
+            found="yes"
          fi
+         umount /dev/${device}
+         if [ "$found" = "yes" ]; then
+            break;
+         fi          
+         echo "/dev/${device} does not contain a rootfs"
       done
       if [ "$found" = "yes" ]; then
-       break;
+         break;
       fi
-      echo "Sleeping for 5 seconds"
-      /bin/sleep 5
-      echo "Sleeping finished"
     done
     echo "will mount root from /dev/${device}"
 
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits

Reply via email to