webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-09 08:48:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into kernel-update

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-07-07 23:17:25 +02:00
parent 44fd6d2bb5 ace40c90ec
commit 08b4415ef2
5 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
etc/system-release etc/system-release
etc/issue etc/issue
etc/rc.d/init.d/collectd etc/rc.d/init.d/collectd
opt/pakfire/lib/functions.sh
srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi
var/ipfire/general-functions.pl var/ipfire/general-functions.pl

10
html/cgi-bin/index.cgi
View File

@@ -2,7 +2,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> # # Copyright (C) 2007-2012 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 #
@@ -489,6 +489,14 @@ foreach my $file (@files) {
} }
} }
# Reiser4 warning
my @files = `mount | grep " reiser4 (" 2>/dev/null`;
foreach my $disk (@files) {
chomp ($disk);
$warnmessage .= "<li>$disk - $Lang::tr{'deprecated fs warn'}</li>\n\n";
}
if ($warnmessage) { if ($warnmessage) {
print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>"; print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
} }

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

@@ -581,6 +581,7 @@
'delete share' => 'Freigabe löschen', 'delete share' => 'Freigabe löschen',
'delete user' => 'Benutzer löschen', 'delete user' => 'Benutzer löschen',
'demon login script' => 'Demon-Anmeldeskript', 'demon login script' => 'Demon-Anmeldeskript',
'deprecated fs warn' => 'Veraltetes Dateisystem! Keine Unterstützung in neueren Kernelversionen. Sichern und Umformatieren!',
'description' => 'Beschreibung', 'description' => 'Beschreibung',
'dest ip and port' => 'Ziel-IP:Port', 'dest ip and port' => 'Ziel-IP:Port',
'destination' => 'Ziel', 'destination' => 'Ziel',

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

@@ -602,6 +602,7 @@
'delete share' => 'Delete share', 'delete share' => 'Delete share',
'delete user' => 'Delete user', 'delete user' => 'Delete user',
'demon login script' => 'Demon login script', 'demon login script' => 'Demon login script',
'deprecated fs warn' => 'Deprecated filesystem! Newer kernel drop the support. Backup and reformat!',
'description' => 'Description', 'description' => 'Description',
'dest ip and port' => 'Dest. IP: Port', 'dest ip and port' => 'Dest. IP: Port',
'destination' => 'Destination', 'destination' => 'Destination',

9
src/pakfire/lib/functions.sh
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) 2007-2012 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 #
@@ -28,6 +28,13 @@ extract_files() {
echo "...Finished." echo "...Finished."
} }
extract_backup_includes() {
echo "Extracting backup includes..."
tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \
var/ipfire/backup/addons/includes
echo "...Finished."
}
remove_files() { remove_files() {
echo "Removing files..." echo "Removing files..."
for i in $(cat /opt/pakfire/db/rootfiles/${NAME}); do for i in $(cat /opt/pakfire/db/rootfiles/${NAME}); do