]> git.openpandora.org Git - openembedded.git/commitdiff
Updated unsling to wait for a mounted rw disk.
authorRod Whitby <rod@whitby.id.au>
Wed, 17 Aug 2005 14:46:23 +0000 (14:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Aug 2005 14:46:23 +0000 (14:46 +0000)
packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling
packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb

index ce2e528c92952473ba47e65ae577ed285c5a41df..bed1789a6f05e713454968870a35137dd120ba41 100755 (executable)
@@ -11,9 +11,11 @@ fi
 
 if [ $# -eq 1 ] ; then
     if [ "$1" = "disk1" ] ; then
+       mtch="/dev/sdb1 /share/hdd/data ext3 rw 0 0"
        targ=/share/hdd/data
        flag=.sda1root
     elif [ "$1" = "disk2" ] ; then
+       mtch="/dev/sda1 /share/flash/data ext3 rw 0 0"
        targ=/share/flash/data
        flag=.sdb1root
     else
@@ -27,11 +29,22 @@ fi
 
 # Check it's a real mount point
 
-if grep $targ /proc/mounts >/dev/null 2>&1 ; then
-    echo "Target disk is $targ"
-else
-    echo "Error: $targ is not a mounted disk"
-    exit 1
+echo "Waiting for $targ"
+CNT=120
+while [ $CNT -gt 0 ]
+do
+   if grep "$mtch" /proc/mounts >/dev/null 2>&1 ; then
+       echo "Target disk is $targ"
+       CNT=-1
+   else
+       echo -ne "\r$CNT   "
+       sleep 1
+       CNT=`expr $CNT - 1`
+   fi
+done
+if [ $CNT -eq 0 ] ; then
+   echo "Error: $targ is not a mounted disk"
+   exit 1
 fi
 
 # Start at the root directory
index 37d561013f7f29575fb8af501f8a6263241641a1..2f2e5e1866d8a908f3a1993f5060e390cb38bd8b 100644 (file)
@@ -1,6 +1,6 @@
 SECTION = "base"
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "nslu2-linksys-libs"