Die IDE/SCSI/SATA/USB-Erkennung erstellt nun schoene Ramdisks :D

[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 f7012b1e05b38320462217ea19fb78416e3392d9..a416299feb3add491191093b1eeb929bb99bd33c 100644 (file)
--- a/src/install+setup/install/mountsource.sh
+++ b/src/install+setup/install/mountsource.sh
@@ -3,22 +3,21 @@
 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
+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 [ -e /cdrom/boot ]; then
-       echo -n ${DEVICE} > /tmp/source_device
-       exit 0
+    if [ -e /cdrom/ipfire-*.tbz2 ]; then
+                       echo -n ${DEVICE} > /tmp/source_device
+                       exit 0
     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
+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 [ -e /cdrom/boot ]; then
-       echo -n ${DEVICE}1 > /tmp/source_device
-       exit 1
+    if [ -e /cdrom/ipfire-*.tbz2 ]; then
+                       echo -n ${DEVICE}1 > /tmp/source_device
+                       exit 1
     fi
     umount /cdrom 2> /dev/null
 done