X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Finstall%2Bsetup%2Finstall%2Fmountsource.sh;h=c3350209c207a51574ea7a68cae5180b4b754b79;hb=8667a65b4e57fd2b2c375e1b580c802385924bda;hp=fbaec7e6e4ad806424cbc0160ada4564e7fd0c71;hpb=207c9813bc3e1ef121bb1bac89752c0a850dda6d;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh
index fbaec7e6e4..c3350209c2 100644
--- a/src/install+setup/install/mountsource.sh
+++ b/src/install+setup/install/mountsource.sh
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# 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        #
@@ -19,18 +19,22 @@
 #                                                                             #
 ###############################################################################
 
+#lfs patch source here...
+version=FullIPFireVersion
+#
+
 echo "Scanning source media"
 
 # 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-*.tlz 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
@@ -38,14 +42,14 @@ done
 # 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}? | sed "s/\/dev\///" 2> /dev/null);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/ipfire-*.tlz 2>/dev/null)" ]; then
+		if [ -n "$(ls /cdrom/${version}.media 2>/dev/null)" ]; then
 			echo -n ${DEVICEP} > /tmp/source_device
-			echo "Found tarball on ${DEVICEP}"
+			echo "Found ${version} on ${DEVICEP}"
 			exit 0
 		else
-			echo "Found no tarballs on ${DEVICEP} - SKIP"
+			echo "not found on ${DEVICEP} - SKIP"
 		fi
 		umount /cdrom 2> /dev/null
 	done
@@ -54,14 +58,14 @@ 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? | sed "s/\/dev\///");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/ipfire-*.tlz 2>/dev/null)" ]; then
+		if [ -n "$(ls /cdrom/${version}.media 2>/dev/null)" ]; then
 			echo -n ${DEVICEP} > /tmp/source_device
-			echo "Found tarball on ${DEVICEP}"
+			echo "Found ${version} on ${DEVICEP}"
 			exit 0
 		else
-			echo "Found no tarballs on ${DEVICEP} - SKIP"
+			echo "not found on ${DEVICEP} - SKIP"
 		fi
 		umount /cdrom 2> /dev/null
 	done