Laedt die USB-Controller von allein...

[people/pmueller/ipfire-2.x.git] / src / install+setup / install / mountsource.sh

diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh
index d46a7e49314b9ed70df6f5b28a5d11835961137b..bd89b4edc445a7b6c1b96d15f61f197d559af875 100644 (file)
--- a/src/install+setup/install/mountsource.sh
+++ b/src/install+setup/install/mountsource.sh
@@ -4,32 +4,32 @@ echo "Scanning source media"
 
 # scan CDROM devices
 for DEVICE in $(kudzu -qps -t 30 -c CDROM | grep device: | cut -d ' ' -f 2 | sort | uniq); do
-    mount /dev/${DEVICE} /cdrom 2> /dev/null
-    if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then
-            echo -n ${DEVICE} > /tmp/source_device
-            echo "Found Sources in ${DEVICE}"
-    else
-            echo "Found no Sources in ${DEVICE} skipping"
-    fi
-    umount /cdrom 2> /dev/null
+               mount /dev/${DEVICE} /cdrom 2> /dev/null
+               if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then
+                       echo -n ${DEVICE} > /tmp/source_device
+                       echo "Found tarball on ${DEVICE}"
+               else
+                       echo "Found no tarballs on ${DEVICE} - SKIP"
+               fi
+               umount /cdrom 2> /dev/null
 done
 
 # scan HD device (usb sticks, etc.)
 for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort | uniq); do
-    mount /dev/${DEVICE}1 /cdrom 2> /dev/null
-    if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then
-            echo -n ${DEVICE} > /tmp/source_device
-            echo "Found Sources in ${DEVICE}"
-    else
-       umount /cdrom 2> /dev/null
-            echo "Found no Sources in ${DEVICE} skipping"
-    fi
-    umount /cdrom 2> /dev/null
+               mount /dev/${DEVICE}1 /cdrom 2> /dev/null
+               if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then
+                       echo -n ${DEVICE} > /tmp/source_device
+                       echo "Found tarball on ${DEVICE}"
+               else
+                       umount /cdrom 2> /dev/null
+                       echo "Found no tarballs on ${DEVICE} - SKIP"
+               fi
+               umount /cdrom 2> /dev/null
 done
 
 if [ -e /tmp/source_device ]; then
-  mount /dev/$(cat /tmp/source_device) /cdrom 2> /dev/null
-  exit 0
+       mount /dev/$(cat /tmp/source_device) /cdrom 2> /dev/null
+       exit 0
 else
-  exit 10
+       exit 10
 fi