From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 22 May 2009 09:29:45 +0000 (+0200)
Subject: Add a source check for fdd-image to mountdest.sh
X-Git-Tag: v2.5-rc1~26^2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=4cdac3e52dca4190a16e3d8b78bc18595be1e4d2

Add a source check for fdd-image to mountdest.sh
---

diff --git a/src/install+setup/install/mountdest.sh b/src/install+setup/install/mountdest.sh
index 6af2b45675..d1ce89b12e 100644
--- a/src/install+setup/install/mountdest.sh
+++ b/src/install+setup/install/mountdest.sh
@@ -27,7 +27,7 @@ for DEVICE in $(kudzu -qps -t 30 -c HD -b IDE | grep device: | cut -d ' ' -f 2 |
 		mount /dev/${DEVICE}1 /harddisk 2> /dev/null
 		if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
 			umount /harddisk 2> /dev/null
-			echo "${DEVICE} is source drive - SKIP"
+			echo "${DEVICE}1 is source drive - SKIP"
 			continue
 		else
 			umount /harddisk 2> /dev/null
@@ -47,7 +47,7 @@ for DEVICE in $(kudzu -qps -t 30 -c HD -b SCSI | grep device: | cut -d ' ' -f 2
 			continue
 		else
 			umount /harddisk 2> /dev/null
-    			mount /dev/${DEVICE}1 /harddisk 2> /dev/null
+			mount /dev/${DEVICE}1 /harddisk 2> /dev/null
 			if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
 				umount /harddisk 2> /dev/null
 				echo "${DEVICE}1 is source drive - SKIP"
@@ -67,19 +67,27 @@ for DEVICE in $(kudzu -qps -t 30 -c HD -b RAID | grep device: | cut -d ' ' -f 2
 		mount /dev/${DEVICE}p1 /harddisk 2> /dev/null
 		if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
 			umount /harddisk 2> /dev/null
-			echo "${DEVICE} is source drive - SKIP"
+			echo "${DEVICE}p1 is source drive - SKIP"
 			continue
 		else
 			umount /harddisk 2> /dev/null
 			mount /dev/${DEVICE}1 /harddisk 2> /dev/null
 			if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
-			    umount /harddisk 2> /dev/null
-			    echo "${DEVICE} is source drive - SKIP"
-			    continue
+				umount /harddisk 2> /dev/null
+				echo "${DEVICE}1 is source drive - SKIP"
+				continue
 			else
-			    echo -n "$DEVICE" > /tmp/dest_device
-			    echo "${DEVICE} - yes, it is our destination"
-			    exit 2
+				umount /harddisk 2> /dev/null
+				mount /dev/${DEVICE} /harddisk 2> /dev/null
+				if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
+					umount /harddisk 2> /dev/null
+					echo "${DEVICE} is source drive - SKIP"
+					continue
+				else
+					echo -n "$DEVICE" > /tmp/dest_device
+					echo "${DEVICE} - yes, it is our destination"
+					exit 2
+				fi
 			fi
 		fi
 done