Merge branch 'core44'

diff --git a/config/rootfiles/core/44/filelists/files b/config/rootfiles/core/44/filelists/files
index 48c38e2f501fd534238f9ee044bffc72c116dc1b..09580590652d4a5b961966bdf01a640af6ac16bb 100644 (file)
--- a/config/rootfiles/core/44/filelists/files
+++ b/config/rootfiles/core/44/filelists/files
@@ -41,6 +41,7 @@ var/ipfire/langs/es.pl
 var/ipfire/menu.d/10-system.menu
 usr/local/bin/fireinfoctrl
 var/ipfire/qos/bin/makeqosscripts.pl
+usr/local/bin/backupiso
 usr/local/bin/timectrl
 usr/local/bin/rebuild-initrd
 usr/local/bin/scanhd

diff --git a/doc/language_issues.es b/doc/language_issues.es
index a91996dd24f231f9743551f46fd7919bc77d02bc..00f1f8f18db27d2cb8f9c56f41f06afc6fe16857 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -507,6 +507,10 @@ WARNING: untranslated string: fireinfo pakfire version
 WARNING: untranslated string: fireinfo please enable
 WARNING: untranslated string: fireinfo settings
 WARNING: untranslated string: fireinfo system version
+WARNING: untranslated string: fireinfo why descr1
+WARNING: untranslated string: fireinfo why descr2
+WARNING: untranslated string: fireinfo why enable
+WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
 WARNING: untranslated string: new
 WARNING: untranslated string: outgoing firewall add ip group

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 8107ab9b6fc63c2c4503d710065a2524d518795c..e491a0fce32ea0323ab9035e98c70011c89d06d4 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -509,6 +509,10 @@ WARNING: untranslated string: fireinfo pakfire version
 WARNING: untranslated string: fireinfo please enable
 WARNING: untranslated string: fireinfo settings
 WARNING: untranslated string: fireinfo system version
+WARNING: untranslated string: fireinfo why descr1
+WARNING: untranslated string: fireinfo why descr2
+WARNING: untranslated string: fireinfo why enable
+WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
 WARNING: untranslated string: new
 WARNING: untranslated string: ntp common settings

diff --git a/doc/language_missings b/doc/language_missings
index e72d7d66393b82764a02bb7b0bc9020bc4fc4600..d0ba138976c8c868fef1727cf7353c0af645097b 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -24,6 +24,10 @@
 < fireinfo please enable
 < fireinfo settings
 < fireinfo system version
+< fireinfo why descr1
+< fireinfo why descr2
+< fireinfo why enable
+< fireinfo why read more
 < fireinfo your profile id
 < ntp common settings
 < ntp sync
@@ -71,6 +75,10 @@
 < fireinfo please enable
 < fireinfo settings
 < fireinfo system version
+< fireinfo why descr1
+< fireinfo why descr2
+< fireinfo why enable
+< fireinfo why read more
 < fireinfo your profile id
 < outgoing firewall add ip group
 < outgoing firewall add mac group

diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi
index 31f899f8274b6c618780657d3037f9485e89bd0b..1be0ebe3388a9d260666c154bb6485814408fd4c 100644 (file)
--- a/html/cgi-bin/fireinfo.cgi
+++ b/html/cgi-bin/fireinfo.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2011  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        #
@@ -61,13 +61,13 @@ if ("$fireinfosettings{'ACTION'}" eq "trigger") {
 &Header::openpage('Fireinfo', 1, '');
 
 if ($fireinfosettings{'ENABLE_FIREINFO'} ne "on") {
-       &Header::openbox("100%", "left", "Why should I enable fireinfo?");
+       &Header::openbox("100%", "left", "$Lang::tr{'fireinfo why enable'}");
 
        print <<END;
 <font color="$Header::colourred">
        <p>
-               It is very important for the development of IPFire that you enable this
-               service. <a href="http://fireinfo.ipfire.org" target="_blank">Read more about the reasons.</a>
+               $Lang::tr{'fireinfo why descr1'}
+               $Lang::tr{'fireinfo why descr2'}<a href="http://fireinfo.ipfire.org" target="_blank">$Lang::tr{'fireinfo why read more'}</a>
        </p>
 </font>
 END

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index bbf9d303f35ee9127a5080686861d9d6c4170fd8..b4db1feee23336fac3fe5109718c62fc412489de 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -793,6 +793,10 @@
 'fireinfo please enable' => 'Bitte schalten Sie den Fireinfo-Dienst ein.',
 'fireinfo settings' => 'Fireinfo-Einstellungen',
 'fireinfo system version' => 'Systemversionen',
+'fireinfo why descr1' => 'Es ist sehr wichtig für die Entwicklung von IPFire, das dieser Dienst',
+'fireinfo why descr2' => 'eingeschaltet ist. ',
+'fireinfo why enable' => 'Warum sollte man Fireinfo einschalten?',
+'fireinfo why read more' => 'Mehr über die Gründe.',
 'fireinfo your profile id' => 'Profil-ID',
 'firewall' => 'Firewall',
 'firewall graphs' => 'Firewall Diagramme',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index ad16ec2bd359855243718d4c6b43a01654c0ce33..a1d687d05fd25aa3401110f0c9d419de88f61f73 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -817,6 +817,10 @@
 'fireinfo please enable' => 'Please enable the fireinfo service.',
 'fireinfo settings' => 'Fireinfo settings',
 'fireinfo system version' => 'System versions',
+'fireinfo why descr1' => 'It is very important for the development of IPFire that you enable this',
+'fireinfo why descr2' => 'service. ',
+'fireinfo why enable' => 'Why should I enable fireinfo?',
+'fireinfo why read more' => 'Read more about the reasons.',
 'fireinfo your profile id' => 'Your profile ID',
 'firewall' => 'Firewall',
 'firewall graphs' => 'Firewall Graphs',

diff --git a/lfs/installer b/lfs/installer
index 553d59901c9dfd30758610c92303cb90fe4cecbd..76619630de10e80682e3864852412b056514e269 100644 (file)
--- a/lfs/installer
+++ b/lfs/installer
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2011  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        #
@@ -63,7 +63,7 @@ $(TARGET) :
        cd $(DIR_APP)/install && install -v -m 0755 install probenic.sh \
                probehw.sh downloadsource.sh mountsource.sh mountdest.sh /install/initrd/bin
        #Patch ISO Name for download ...
-       sed -i -e "s|ipfire.iso|$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso|g" \
+       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
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/install+setup/install/downloadsource.sh b/src/install+setup/install/downloadsource.sh
index fad2609d59db40a6b9ce03bdcdad5b0f2b415e89..5c6360dca16bfc540354bc70dd1818bc96593968 100644 (file)
--- a/src/install+setup/install/downloadsource.sh
+++ b/src/install+setup/install/downloadsource.sh
@@ -19,7 +19,9 @@
 #                                                                             #
 ###############################################################################
 
-IPFireISO=download.ipfire.org/iso/ipfire.iso
+#lfs change the url while build!
+IPFireISO=ipfire.iso
+#
 
 #Get user defined download from boot cmdline
 grep "netinstall=" /proc/cmdline > /dev/null && CMDLINE=1

diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index 72e6a0b4b32ad7499e1f1f0ba3410cb1857b1f49..426c1e45fb9c7be66eefa2b65594bdfb2c87ecc1 100644 (file)
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -2,7 +2,7 @@
 
 COREVER=`cat /opt/pakfire/db/core/mine`
 # FIXME: edit this lines before release
-URL=http://download.ipfire.org/iso/
+URL=http://download.ipfire.org/releases/ipfire-2.x/2.9-core$COREVER/
 ISO=ipfire-2.9.i586-full-core$COREVER.iso
 
 if [ -z "$1" ]; then