X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Finstaller;h=65681b9e209632515d7721588d64c65d215f4780;hb=9a7e4d85069b6475d231e4fdfbd26d93557d3f10;hp=7f73222c1b87170742141379b46e50115896a564;hpb=91849af949e0a641c5e885df561ca0fe828eead4;p=people%2Fmfischer%2Fipfire-2.x.git

diff --git a/lfs/installer b/lfs/installer
index 7f73222c1b..65681b9e20 100644
--- a/lfs/installer
+++ b/lfs/installer
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  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        #
@@ -31,6 +31,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 SLOGAN     = An Open Source Firewall Solution
+DOWNLOAD_URL = https://downloads.ipfire.org/releases/ipfire-2.x/$(VERSION)-core$(CORE)/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +43,7 @@ check :
 
 download :
 
-md5 :
+b2 :
 
 ###############################################################################
 # Installation Details
@@ -58,12 +59,12 @@ $(TARGET) :
 		--with-distro-name="$(NAME)" \
 		--with-distro-sname="$(SNAME)" \
 		--with-distro-slogan="$(SLOGAN)" \
-		--with-config-root="$(CONFIG_ROOT)"
+		--with-distro-version="$(VERSION)-core$(CORE)" \
+		--with-config-root="$(CONFIG_ROOT)" \
+		--with-download-url="$(DOWNLOAD_URL)"
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
-	#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" \
-	#			/usr/bin/downloadsource.sh
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)