X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Finstaller;h=c02e0bac5c6f374212048e017b255f72e9eb3a1d;hp=077c02ba4885668425afa57a0f8e24c2ed801737;hb=fab611b3d831855a213e18539bb79c598b28d1cf;hpb=0e325635f85a991b23adfed5e87a77340ffc4ed3

diff --git a/lfs/installer b/lfs/installer
index 077c02ba4..c02e0bac5 100644
--- a/lfs/installer
+++ b/lfs/installer
@@ -1,28 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2012  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 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# 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 IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: installer,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,6 +24,8 @@
 
 include Config
 
+VER = ipfire
+
 THISAPP    = installer
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -54,6 +48,7 @@ md5 :
 
 $(TARGET) :
 	@$(PREBUILD)
+	-mkdir -p /install/initrd/bin
 	@rm -rf $(DIR_APP) && mkdir $(DIR_APP) && cp -R $(DIR_SRC)/src/install+setup/* $(DIR_APP)
 	for i in $(DIR_SRC)/langs/*/install/lang_*.c ; do \
 	    cp $$i $(DIR_APP)/libsmooth; \
@@ -65,6 +60,13 @@ $(TARGET) :
 	cd $(DIR_APP)/install && make CFLAGS="-Os -fomit-frame-pointer -Wall \
 	    -DNAME='\"$(NAME)\"' -DSNAME='\"$(SNAME)\"' -DVERSION='\"$(VERSION)\"' \
 	     -DSLOGAN='\"$(SLOGAN)\"' -DCONFIG_ROOT='\"$(CONFIG_ROOT)\"' -DKERNEL_VERSION='\"$(KVER)\"'"
-	cd $(DIR_APP)/install && install -m 0755 install probescsi.sh /install/initrd/bin
+	cd $(DIR_APP)/install && install -v -m 0755 install probenic.sh \
+		downloadsource.sh mountsource.sh mountdest.sh /install/initrd/bin
+	#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)