Swap Size verringert und kleine Aenderung im Mountsource

[people/teissler/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 b30fb15eb4e7e5652cb5c8965ec5b8825fb7cf16..cf261d36dd49917484d544dd1a9bbe986193706b 100644 (file)
--- a/src/install+setup/install/mountsource.sh
+++ b/src/install+setup/install/mountsource.sh
@@ -3,24 +3,33 @@
 echo "Scanning source media"
 
 # scan CDROM devices
-
-for DEVICE in $(hwinfo --cdrom | grep "Device File" | awk -F: '{ print $2 }' | cut -c 7- | sort | uniq); do
-    mount /dev/${DEVICE} /cdrom 2> /dev/null
-    if [ -e /cdrom/boot ]; then
-       echo -n ${DEVICE} > /tmp/source_device
-       exit 0
-    fi
-    umount /cdrom 2> /dev/null
+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 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 $(hwinfo --usb --disk | grep "Device File" | awk -F: '{ print $2 }' | cut -c 7- | sort | uniq); do
-    mount /dev/${DEVICE}1 /cdrom 2> /dev/null
-    if [ -e /cdrom/boot ]; then
-       echo -n ${DEVICE}1 > /tmp/source_device
-       exit 1
-    fi
-    umount /cdrom 2> /dev/null
+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 tarball on ${DEVICE}"
+               else
+                       umount /cdrom 2> /dev/null
+                       echo "Found no tarballs on ${DEVICE} - SKIP"
+               fi
+               umount /cdrom 2> /dev/null
 done
 
-exit 10
+if [ -e "/tmp/source_device" ]; then
+       mount /dev/$(cat /tmp/source_device) /cdrom 2> /dev/null
+       exit 0
+else
+       exit 10
+fi