Merge remote-tracking branch 'glotzi/nut-update' into next

[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 bd89b4edc445a7b6c1b96d15f61f197d559af875..c3350209c207a51574ea7a68cae5180b4b754b79 100644 (file)
--- a/src/install+setup/install/mountsource.sh
+++ b/src/install+setup/install/mountsource.sh
@@ -1,35 +1,74 @@
 #!/bin/sh
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# 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/>.       #
+#                                                                             #
+###############################################################################
+
+#lfs patch source here...
+version=FullIPFireVersion
+#
 
 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
+# scan all Block devices
+for DEVICE in `find /sys/block/* -maxdepth 0 ! -name fd* ! -name loop* ! -name ram* -exec basename {} \;`
+do
                mount /dev/${DEVICE} /cdrom 2> /dev/null
-               if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then
+               if [ -n "$(ls /cdrom/${version}.media 2>/dev/null)" ]; then
                        echo -n ${DEVICE} > /tmp/source_device
-                       echo "Found tarball on ${DEVICE}"
+                       echo "Found ${version} on ${DEVICE}"
+                       exit 0
                else
-                       echo "Found no tarballs on ${DEVICE} - SKIP"
+                       echo "not found on ${DEVICE} - SKIP"
                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
-               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}"
+# scan all Partitions on block devices
+for DEVICE in `find /sys/block/* -maxdepth 0 ! -name fd* ! -name loop* ! -name ram* -exec basename {} \;`
+do
+       for DEVICEP in $(ls /dev/${DEVICE}? 2>/dev/null | sed "s/\/dev\///");do
+               mount /dev/${DEVICEP} /cdrom 2> /dev/null
+               if [ -n "$(ls /cdrom/${version}.media 2>/dev/null)" ]; then
+                       echo -n ${DEVICEP} > /tmp/source_device
+                       echo "Found ${version} on ${DEVICEP}"
+                       exit 0
+               else
+                       echo "not found on ${DEVICEP} - SKIP"
+               fi
+               umount /cdrom 2> /dev/null
+       done
+done
+
+# scan all Partitions on raid/mmc devices
+for DEVICE in `find /sys/block/* -maxdepth 0 ! -name fd* ! -name loop* ! -name ram* -exec basename {} \;`
+do
+       for DEVICEP in $(ls /dev/${DEVICE}p? 2>/dev/null | sed "s/\/dev\///");do
+               mount /dev/${DEVICEP} /cdrom 2> /dev/null
+               if [ -n "$(ls /cdrom/${version}.media 2>/dev/null)" ]; then
+                       echo -n ${DEVICEP} > /tmp/source_device
+                       echo "Found ${version} on ${DEVICEP}"
+                       exit 0
                else
-                       umount /cdrom 2> /dev/null
-                       echo "Found no tarballs on ${DEVICE} - SKIP"
+                       echo "not found on ${DEVICEP} - SKIP"
                fi
                umount /cdrom 2> /dev/null
+       done
 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