webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'core44'

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-01-14 23:34:36 +01:00
parent 59ebbeccab 05abd7ba25
commit 23517bda8b
10 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/44/filelists/files
View File

@@ -41,6 +41,7 @@ var/ipfire/langs/es.pl
var/ipfire/menu.d/10-system.menu var/ipfire/menu.d/10-system.menu
usr/local/bin/fireinfoctrl usr/local/bin/fireinfoctrl
var/ipfire/qos/bin/makeqosscripts.pl var/ipfire/qos/bin/makeqosscripts.pl
usr/local/bin/backupiso
usr/local/bin/timectrl usr/local/bin/timectrl
usr/local/bin/rebuild-initrd usr/local/bin/rebuild-initrd
usr/local/bin/scanhd usr/local/bin/scanhd

4
doc/language_issues.es
View File

@@ -507,6 +507,10 @@ WARNING: untranslated string: fireinfo pakfire version
WARNING: untranslated string: fireinfo please enable WARNING: untranslated string: fireinfo please enable
WARNING: untranslated string: fireinfo settings WARNING: untranslated string: fireinfo settings
WARNING: untranslated string: fireinfo system version 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: fireinfo your profile id
WARNING: untranslated string: new WARNING: untranslated string: new
WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add ip group

4
doc/language_issues.fr
View File

@@ -509,6 +509,10 @@ WARNING: untranslated string: fireinfo pakfire version
WARNING: untranslated string: fireinfo please enable WARNING: untranslated string: fireinfo please enable
WARNING: untranslated string: fireinfo settings WARNING: untranslated string: fireinfo settings
WARNING: untranslated string: fireinfo system version 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: fireinfo your profile id
WARNING: untranslated string: new WARNING: untranslated string: new
WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp common settings

8
doc/language_missings
View File

@@ -24,6 +24,10 @@
< fireinfo please enable < fireinfo please enable
< fireinfo settings < fireinfo settings
< fireinfo system version < fireinfo system version
< fireinfo why descr1
< fireinfo why descr2
< fireinfo why enable
< fireinfo why read more
< fireinfo your profile id < fireinfo your profile id
< ntp common settings < ntp common settings
< ntp sync < ntp sync
@@ -71,6 +75,10 @@
< fireinfo please enable < fireinfo please enable
< fireinfo settings < fireinfo settings
< fireinfo system version < fireinfo system version
< fireinfo why descr1
< fireinfo why descr2
< fireinfo why enable
< fireinfo why read more
< fireinfo your profile id < fireinfo your profile id
< outgoing firewall add ip group < outgoing firewall add ip group
< outgoing firewall add mac group < outgoing firewall add mac group

8
html/cgi-bin/fireinfo.cgi
View File

@@ -2,7 +2,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # 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 # # 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 # # 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, ''); &Header::openpage('Fireinfo', 1, '');
if ($fireinfosettings{'ENABLE_FIREINFO'} ne "on") { 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; print <<END;
<font color="$Header::colourred"> <font color="$Header::colourred">
<p> <p>
It is very important for the development of IPFire that you enable this $Lang::tr{'fireinfo why descr1'}
service. <a href="http://fireinfo.ipfire.org" target="_blank">Read more about the reasons.</a> $Lang::tr{'fireinfo why descr2'}<a href="http://fireinfo.ipfire.org" target="_blank">$Lang::tr{'fireinfo why read more'}</a>
</p> </p>
</font> </font>
END END

4
langs/de/cgi-bin/de.pl
View File

@@ -793,6 +793,10 @@
'fireinfo please enable' => 'Bitte schalten Sie den Fireinfo-Dienst ein.', 'fireinfo please enable' => 'Bitte schalten Sie den Fireinfo-Dienst ein.',
'fireinfo settings' => 'Fireinfo-Einstellungen', 'fireinfo settings' => 'Fireinfo-Einstellungen',
'fireinfo system version' => 'Systemversionen', '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', 'fireinfo your profile id' => 'Profil-ID',
'firewall' => 'Firewall', 'firewall' => 'Firewall',
'firewall graphs' => 'Firewall Diagramme', 'firewall graphs' => 'Firewall Diagramme',

4
langs/en/cgi-bin/en.pl
View File

@@ -817,6 +817,10 @@
'fireinfo please enable' => 'Please enable the fireinfo service.', 'fireinfo please enable' => 'Please enable the fireinfo service.',
'fireinfo settings' => 'Fireinfo settings', 'fireinfo settings' => 'Fireinfo settings',
'fireinfo system version' => 'System versions', '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', 'fireinfo your profile id' => 'Your profile ID',
'firewall' => 'Firewall', 'firewall' => 'Firewall',
'firewall graphs' => 'Firewall Graphs', 'firewall graphs' => 'Firewall Graphs',

4
lfs/installer
View File

@@ -1,7 +1,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # 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 # # 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 # # 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 \ cd $(DIR_APP)/install && install -v -m 0755 install probenic.sh \
probehw.sh downloadsource.sh mountsource.sh mountdest.sh /install/initrd/bin probehw.sh downloadsource.sh mountsource.sh mountdest.sh /install/initrd/bin
#Patch ISO Name for download ... #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 /install/initrd/bin/downloadsource.sh
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

4
src/install+setup/install/downloadsource.sh
View File

@@ -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 #Get user defined download from boot cmdline
grep "netinstall=" /proc/cmdline > /dev/null && CMDLINE=1 grep "netinstall=" /proc/cmdline > /dev/null && CMDLINE=1

2
src/scripts/backupiso
View File

@@ -2,7 +2,7 @@
COREVER=`cat /opt/pakfire/db/core/mine` COREVER=`cat /opt/pakfire/db/core/mine`
# FIXME: edit this lines before release # 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 ISO=ipfire-2.9.i586-full-core$COREVER.iso
if [ -z "$1" ]; then if [ -z "$1" ]; then