[PC-BSD Commits] r2722 - pcbsd/trunk/mfsroot-overlay/etc

[svn at pcbsd.org]

Author: kris
Date: 2008-09-08 08:47:41 -0700 (Mon, 08 Sep 2008)
New Revision: 2722

Modified:
   pcbsd/trunk/mfsroot-overlay/etc/rc
Log:

Updated rc to check for USB fat partitions properly.

Thanks to yerenkow at uct.ua!



Modified: pcbsd/trunk/mfsroot-overlay/etc/rc
===================================================================
--- pcbsd/trunk/mfsroot-overlay/etc/rc	2008-09-06 19:54:59 UTC (rev 2721)
+++ pcbsd/trunk/mfsroot-overlay/etc/rc	2008-09-08 15:47:41 UTC (rev 2722)
@@ -75,16 +75,11 @@
 
 
 
-# No install image on CD was found, lets check for USB now
+# No install image on CD was found, lets check for USB UFS now
 if [ "$FOUND" = "0" ]
 then
 
-USBDEVS="/dev/da0s1a
-/dev/da1s1a
-/dev/da2s1a
-/dev/da3s1a
-/dev/da4s1a
-/dev/da5s1a" 
+USBDEVS="`ls -1 /dev/da*`"
 
 for j in $USBDEVS
 do
@@ -102,8 +97,28 @@
 
 fi
 
+# Still no media, search for USB FAT partition now
 if [ "$FOUND" = "0" ]
 then
+
+for j in $USBDEVS
+do
+  # Find the CD Device
+  /sbin/mount -t msdosfs $j /mnt >/dev/null 2>/dev/null
+  if [ -e "/mnt/uzip/usr.uzip" ]
+  then
+   FOUND=1
+   CDDEV="$j"
+   break
+  else
+   /sbin/umount /mnt >/dev/null 2>/dev/null
+  fi
+done
+
+fi
+
+if [ "$FOUND" = "0" ]
+then
    echo "Error mounting install image!!!"
    echo "Please report this problem to PC-BSD support!"
    echo "Press ENTER to reboot"