From 03df106a066686dc488f8dec10fcc7f594078b82 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 2 May 2009 10:10:28 +0200
Subject: [PATCH] Stopp source device scan after first detection

---
 src/install+setup/install/mountsource.sh | 30 ++++++++++--------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh
index 9b71e20b5..5c654a11f 100644
--- a/src/install+setup/install/mountsource.sh
+++ b/src/install+setup/install/mountsource.sh
@@ -27,41 +27,37 @@ for DEVICE in $(kudzu -qps -t 30 -c CDROM | grep device: | cut -d ' ' -f 2 | sor
 		if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then
 			echo -n ${DEVICE} > /tmp/source_device
 			echo "Found tarball on ${DEVICE}"
+			exit 0
 		else
 			echo "Found no tarballs on ${DEVICE} - SKIP"
 		fi
 		umount /cdrom 2> /dev/null
 done
 
-# scan HD device unpart (usb sticks, etc.)
+# scan HD device part1 (usb sticks, etc.)
 for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort | uniq); do
-		mount /dev/${DEVICE} /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}"
+			echo -n ${DEVICE}1 > /tmp/source_device
+			echo "Found tarball on ${DEVICE}1"
+			exit 0
 		else
-			umount /cdrom 2> /dev/null
-			echo "Found no tarballs on ${DEVICE} - SKIP"
+			echo "Found no tarballs on ${DEVICE}1 - SKIP"
 		fi
 		umount /cdrom 2> /dev/null
 done
 
-# scan HD device part1 (usb sticks, etc.)
+# scan HD device unpart (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
+		mount /dev/${DEVICE} /cdrom 2> /dev/null
 		if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then
-			echo -n ${DEVICE}1 > /tmp/source_device
-			echo "Found tarball on ${DEVICE}1"
+			echo -n ${DEVICE} > /tmp/source_device
+			echo "Found tarball on ${DEVICE}"
+			exit 0
 		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
-else
-	exit 10
-fi
+exit 10
-- 
2.39.2