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

diff --git a/config/rootfiles/core/61/filelists/files b/config/rootfiles/core/61/filelists/files
index 11316ebad211aa7df3b8255730f04916cb97b75f..56981ed01cb9a73eeb7eeb7a4e25ac21ac14efe4 100644 (file)
--- a/config/rootfiles/core/61/filelists/files
+++ b/config/rootfiles/core/61/filelists/files
@@ -1,6 +1,7 @@
 etc/system-release
 etc/issue
 etc/rc.d/init.d/collectd
+opt/pakfire/lib/functions.sh
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 var/ipfire/general-functions.pl

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 9f559275a13821b5e94246f924a823aacf8b947b..01bb3d6850c13f25f5de12f6f8c94b348ed69353 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # 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        #
 # 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) {
        print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
 }

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 9bd2c72172b265bd8c94f775a00b947d1160e0b6..c7f254ae64ee87fd35c4a0dc615311e8ea658ece 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -581,6 +581,7 @@
 'delete share' => 'Freigabe löschen',
 'delete user' => 'Benutzer löschen',
 'demon login script' => 'Demon-Anmeldeskript',
+'deprecated fs warn' => 'Veraltetes Dateisystem! Keine Unterstützung in neueren Kernelversionen. Sichern und Umformatieren!',
 'description' => 'Beschreibung',
 'dest ip and port' => 'Ziel-IP:Port',
 'destination' => 'Ziel',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index d1c3b6b42e6dd511e890af80c0e08b54a06259b3..52872f49ac9d6c9a9dd21060ad959260fab1dc83 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -602,6 +602,7 @@
 'delete share' => 'Delete share',
 'delete user' => 'Delete user',
 'demon login script' => 'Demon login script',
+'deprecated fs warn' => 'Deprecated filesystem! Newer kernel drop the support. Backup and reformat!',
 'description' => 'Description',
 'dest ip and port' => 'Dest. IP: Port',
 'destination' => 'Destination',

diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh
index 2f6491f28e3b4a7862a775787ae30cca8061bb78..bc05bd01e0112d137715241c36e5cfc8faed9a69 100644 (file)
--- a/src/pakfire/lib/functions.sh
+++ b/src/pakfire/lib/functions.sh
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # 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        #
 # it under the terms of the GNU General Public License as published by        #
@@ -28,6 +28,13 @@ extract_files() {
        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() {
        echo "Removing files..."
        for i in $(cat /opt/pakfire/db/rootfiles/${NAME}); do