From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 7 Jul 2012 17:40:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into kernel-update
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=c78993cdde0391d1336797dd4368b41794a40487;hp=986a6b7c491a5f4a299f3f2f5f4511e33409f379

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 11316ebad..56981ed01 100644
--- 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 9f559275a..01bb3d685 100644
--- 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 9bd2c7217..c7f254ae6 100644
--- 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 d1c3b6b42..52872f49a 100644
--- 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 2f6491f28..bc05bd01e 100644
--- 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