Fix usb-fdd detection in mountdest.sh

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

diff --git a/src/install+setup/install/mountdest.sh b/src/install+setup/install/mountdest.sh
index 93b972d35e13643a2aa68f715366a82dbc2fcda5..6af2b4567501e64296c4ecbdb61176eeb7fc9953 100644 (file)
--- a/src/install+setup/install/mountdest.sh
+++ b/src/install+setup/install/mountdest.sh
@@ -1,11 +1,29 @@
 #!/bin/sh
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 
 echo "Scanning for possible destination drives"
 
 # scan IDE devices
 echo "--> IDE"
 for DEVICE in $(kudzu -qps -t 30 -c HD -b IDE | grep device: | cut -d ' ' -f 2 | sort | uniq); do
-               echo -n "---> $DEVICE"
                mount /dev/${DEVICE}1 /harddisk 2> /dev/null
                if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
                        umount /harddisk 2> /dev/null
@@ -22,24 +40,30 @@ done
 # scan USB/SCSI devices
 echo "--> USB/SCSI"
 for DEVICE in $(kudzu -qps -t 30 -c HD -b SCSI | grep device: | cut -d ' ' -f 2 | sort | uniq); do
-               echo -n "---> $DEVICE"
-               mount /dev/${DEVICE}1 /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
                        umount /harddisk 2> /dev/null
-                       echo -n "$DEVICE" > /tmp/dest_device
-                       echo "${DEVICE} - yes, it is our destination"
-                       exit 1
+                       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"
+                               continue
+                       else
+                               umount /harddisk 2> /dev/null
+                               echo -n "$DEVICE" > /tmp/dest_device
+                               echo "${DEVICE} - yes, it is our destination"
+                               exit 1
+                       fi
                fi
 done
 
 # scan RAID devices
 echo "--> RAID"
 for DEVICE in $(kudzu -qps -t 30 -c HD -b RAID | grep device: | cut -d ' ' -f 2 | sort | uniq); do
-               echo -n "---> $DEVICE"
                mount /dev/${DEVICE}p1 /harddisk 2> /dev/null
                if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
                        umount /harddisk 2> /dev/null
@@ -47,9 +71,16 @@ for DEVICE in $(kudzu -qps -t 30 -c HD -b RAID | grep device: | cut -d ' ' -f 2
                        continue
                else
                        umount /harddisk 2> /dev/null
-                       echo -n "$DEVICE" > /tmp/dest_device
-                       echo "${DEVICE} - yes, it is our destination"
-                       exit 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"
+                           continue
+                       else
+                           echo -n "$DEVICE" > /tmp/dest_device
+                           echo "${DEVICE} - yes, it is our destination"
+                           exit 2
+                       fi
                fi
 done