Author: sparky
Date: Wed Mar 22 22:29:57 2006
New Revision: 7284

Modified:
   ppcrcd/trunk/initrd.dir/linuxrc
Log:
- don't try device again and again if filesystem was found but there was no 
ppcrcd.sqf file


Modified: ppcrcd/trunk/initrd.dir/linuxrc
==============================================================================
--- ppcrcd/trunk/initrd.dir/linuxrc     (original)
+++ ppcrcd/trunk/initrd.dir/linuxrc     Wed Mar 22 22:29:57 2006
@@ -31,12 +31,19 @@
        $B/insmod $P/lib/modules/$1.ko 2>$P/dev/null
 }
 
+TRIED=":"
 checkcd() {
        FS=$1
        $B/echo "${cG}*** Searching PPCRCD cdrom${cE}"
+       echo -n "$FS: "
        for CD in $DRIVES; do
+               $B/echo "$TRIED" | $B/awk "/:$CD:/ {exit 0}; {exit 1}" \
+                       && continue
                $B/echo -n "$CD.."
                $B/mount -n -t $FS $P/dev/$CD /media/ppcrcd -r 2>$P/dev/null
+               if $B/test -eq 0 && $B/test -n "`ls /media/ppcrcd`"; then
+                       TRIED="$TRIED$CD:"
+               fi
                if $B/test -f /media/ppcrcd/ppcrcd.sqf; then
                        $B/echo "    Found: /dev/$CD"
                        FOUND=$CD
@@ -44,6 +51,7 @@
                fi
                $B/umount /media/ppcrcd 2>$P/dev/null
        done
+       echo
 }
 
 findcd() {
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to