* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. fab611b3d831855a213e18539bb79c598b28d1cf
@ 2013-05-29 18:56 git
0 siblings, 0 replies; only message in thread
From: git @ 2013-05-29 18:56 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 6042 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via fab611b3d831855a213e18539bb79c598b28d1cf (commit)
from 8e133f653c735502e0d82990d6a60846b2000757 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fab611b3d831855a213e18539bb79c598b28d1cf
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed May 29 20:56:07 2013 +0200
installer: add core version to source media detection.
-----------------------------------------------------------------------
Summary of changes:
lfs/cdrom | 3 ++-
lfs/installer | 3 +++
src/install+setup/install/mountsource.sh | 24 ++++++++++++++----------
3 files changed, 19 insertions(+), 11 deletions(-)
Difference in files:
diff --git a/lfs/cdrom b/lfs/cdrom
index 48ac891..ede343e 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2013 IPFire Team <info(a)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 740793a..c02e0ba 100644
--- 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 fbaec7e..267823a 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(a)ipfire.org> #
+# Copyright (C) 2007-2013 IPFire Team <info(a)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
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-05-29 18:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-29 18:56 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. fab611b3d831855a213e18539bb79c598b28d1cf git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox