installer: add core version to source media detection.

diff --git a/lfs/cdrom b/lfs/cdrom
index 48ac8918b60e4c9b4e17af1ba2fc3db4fb323dba..ede343e2abcb521b96ae345baf24ebca800f7b2e 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2013  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        #
@@ -77,6 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd /tmp && tar  cf /install/cdrom/$(SNAME)-$(VERSION).tlz $(TAR_OPTIONS) * && rm -rf *
 
        # Other files
+       touch /install/cdrom/$(SNAME)-$(VERSION)-core$(CORE).media
        sed 's/VERSION/$(VERSION)/' $(DIR_SRC)/config/cdrom/README.txt > /install/cdrom/README.txt
        cp $(DIR_SRC)/doc/COPYING                               /install/cdrom/
        cp $(DIR_SRC)/doc/{ChangeLog,packages-list.txt} /install/cdrom/doc

diff --git a/lfs/installer b/lfs/installer
index 740793a04ac2aea846b8c301c40be9e7d3852536..c02e0bac5c6f374212048e017b255f72e9eb3a1d 100644 (file)
--- a/lfs/installer
+++ b/lfs/installer
@@ -65,5 +65,8 @@ $(TARGET) :
        #Patch ISO Name for download ...
        sed -i -e "s|ipfire.iso|download.ipfire.org/releases/ipfire-2.x/$(VERSION)-core$(CORE)/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso|g" \
                                /install/initrd/bin/downloadsource.sh
+       #Patch version for mediacheck ...
+       sed -i -e "s|FullIPFireVersion|$(SNAME)-$(VERSION)-core$(CORE)|g" \
+                               /install/initrd/bin/mountsource.sh
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh
index fbaec7e6e4ad806424cbc0160ada4564e7fd0c71..267823a1dcc14cf549147db2626e27111a444f56 100644 (file)
--- 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-2013  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
@@ -40,12 +44,12 @@ for DEVICE in `find /sys/block/* -maxdepth 0 ! -name fd* ! -name loop* ! -name r
 do
        for DEVICEP in $(ls /dev/${DEVICE}? | sed "s/\/dev\///" 2> /dev/null);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
@@ -56,12 +60,12 @@ for DEVICE in `find /sys/block/* -maxdepth 0 ! -name fd* ! -name loop* ! -name r
 do
        for DEVICEP in $(ls /dev/${DEVICE}p? | 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