From 475294d49e3c203037985a3de5ee674576d134dc Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 14 Jan 2011 23:05:48 +0100 Subject: [PATCH 1/4] Add backupiso script to updater. --- config/rootfiles/core/44/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/44/filelists/files b/config/rootfiles/core/44/filelists/files index 48c38e2f5..095805906 100644 --- 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 From 856c9bf08de8297af1d0e7225bdb3dc2098781c6 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 14 Jan 2011 23:09:38 +0100 Subject: [PATCH 2/4] fireinfo: add missing translation (why fireinfo). --- doc/language_issues.es | 4 ++++ doc/language_issues.fr | 4 ++++ doc/language_missings | 8 ++++++++ html/cgi-bin/fireinfo.cgi | 8 ++++---- langs/de/cgi-bin/de.pl | 4 ++++ langs/en/cgi-bin/en.pl | 4 ++++ 6 files changed, 28 insertions(+), 4 deletions(-) diff --git a/doc/language_issues.es b/doc/language_issues.es index a91996dd2..00f1f8f18 100644 --- 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 8107ab9b6..e491a0fce 100644 --- 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 e72d7d663..d0ba13897 100644 --- 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 31f899f82..1be0ebe33 100644 --- 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 # # # # 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 <

- It is very important for the development of IPFire that you enable this - service. Read more about the reasons. + $Lang::tr{'fireinfo why descr1'} + $Lang::tr{'fireinfo why descr2'}$Lang::tr{'fireinfo why read more'}

END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index bbf9d303f..b4db1feee 100644 --- 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 ad16ec2bd..a1d687d05 100644 --- 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', From d4503cde253bb6888e0a5a58782b6af8050f17b0 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 14 Jan 2011 23:30:03 +0100 Subject: [PATCH 3/4] installer: change url for netinstall. --- lfs/installer | 4 ++-- src/install+setup/install/downloadsource.sh | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lfs/installer b/lfs/installer index 553d59901..76619630d 100644 --- 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 # # # # 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 fad2609d5..5c6360dca 100644 --- 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 From 05abd7ba2501dad59e367c2e1b7423ce2ecff1ff Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 14 Jan 2011 23:33:27 +0100 Subject: [PATCH 4/4] backupiso: change download url. --- src/scripts/backupiso | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/backupiso b/src/scripts/backupiso index 72e6a0b4b..426c1e45f 100644 --- 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