mdadm: add cgi to display the md-state.

diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu
index d71354043c379b5571aa7d727f1c1a4de7df0000..c0b780a0624080ea73373376626127356e99b77f 100644 (file)
--- a/config/menu/20-status.menu
+++ b/config/menu/20-status.menu
@@ -69,3 +69,8 @@
                                  'title' => 'Atm-status',
                                  'enabled' => `find /sys/class/atm/*/device 2>/dev/null`,
                                  };
+    $substatus->{'76.mdstat'} = {'caption' => 'Mdstat',
+                                 'uri' => '/cgi-bin/mdstat.cgi',
+                                 'title' => 'Mdstat',
+                                 'enabled' => 1,
+                                 };

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index c7262a5aedf60c099069ff93e15b268cc36c022a..be4648b0a833d794c518a1eca48ffe7e1e765e09 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -1333,6 +1333,7 @@ srv/web/ipfire/cgi-bin/ipinfo.cgi
 srv/web/ipfire/cgi-bin/iptables.cgi
 srv/web/ipfire/cgi-bin/logs.cgi
 srv/web/ipfire/cgi-bin/mac.cgi
+#srv/web/ipfire/cgi-bin/mdstat.cgi
 srv/web/ipfire/cgi-bin/media.cgi
 srv/web/ipfire/cgi-bin/memory.cgi
 srv/web/ipfire/cgi-bin/modem.cgi

diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files
index 9d0af8036d5ef08fa6781a49ece721c4300ecbea..8e21e3fd2f777e4ae0e5b765e7d75e88f96dcb49 100644 (file)
--- a/config/rootfiles/core/49/filelists/files
+++ b/config/rootfiles/core/49/filelists/files
@@ -13,4 +13,5 @@ var/ipfire/langs/de.pl
 var/ipfire/langs/en.pl
 var/ipfire/langs/es.pl
 var/ipfire/langs/fr.pl
+var/ipfire/menu.d/20-status.menu
 usr/local/bin/scanhd

diff --git a/config/rootfiles/packages/mdadm b/config/rootfiles/packages/mdadm
index aa735898177ac1909f37a247374a677d8f136a62..d593cac2541167f8574c68e5793b7df364cf8b82 100644 (file)
--- a/config/rootfiles/packages/mdadm
+++ b/config/rootfiles/packages/mdadm
@@ -9,3 +9,4 @@ sbin/mdmon
 #usr/share/man/man8/mdadm.8
 #usr/share/man/man8/mdmon.8
 etc/rc.d/init.d/mdadm
+srv/web/ipfire/cgi-bin/mdstat.cgi

diff --git a/html/cgi-bin/mdstat.cgi b/html/cgi-bin/mdstat.cgi
new file mode 100644 (file)
index 0000000..35c7deb
--- /dev/null
+++ b/html/cgi-bin/mdstat.cgi
@@ -0,0 +1,51 @@
+#!/usr/bin/perl
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2011  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+use strict;
+
+# enable only the following on debugging purpose
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
+
+require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "${General::swroot}/header.pl";
+
+my %color = ();
+my %mainsettings = ();
+
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
+&Header::showhttpheaders();
+&Header::openpage($Lang::tr{'status information'}, 1, '');
+&Header::openbigbox('100%', 'left');
+
+&Header::openbox('100%', 'left',"MD Raid State");
+
+print '<textarea rows="25" cols="80" readonly="true">';
+print `cat "/proc/mdstat"`;
+print '</textarea>';
+
+&Header::closebox();
+
+&Header::closebigbox();
+&Header::closepage();

diff --git a/src/scripts/scanhd b/src/scripts/scanhd
index ee946b79275eb601e7b53bc26897237156547e3c..0d97d55303815422d085a877a5447d36707a47f7 100644 (file)
--- a/src/scripts/scanhd
+++ b/src/scripts/scanhd
@@ -4,7 +4,7 @@ case "$1" in
        ide)
                /sbin/kudzu -qps -c HD | egrep "desc|device:" | awk -F': ' '{print $2}' | sed -e '/"$/a\\' -e "s/$/\;/g" | tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/\;X/\;/g" | grep '^"' -v > /var/ipfire/extrahd/scan
                if [ -e /dev/.mdadm ]; then
-                       echo 'md;"MDADM software-raid";' >> /var/ipfire/extrahd/scan
+                       echo 'md;"MD Software-Raid";' >> /var/ipfire/extrahd/scan
                fi
                if [ -e /dev/mmcblk0 ]; then
                        echo 'mmcblk0;"MMC/SD Cardreader";' >> /var/ipfire/extrahd/scan