From 339dbffc70042b8415d4407f35dc008fc9e51ecb Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 22 Apr 2011 17:03:23 +0200 Subject: [PATCH] mdadm: add cgi to display the md-state. --- config/menu/20-status.menu | 5 +++ config/rootfiles/common/apache2 | 1 + config/rootfiles/core/49/filelists/files | 1 + config/rootfiles/packages/mdadm | 1 + html/cgi-bin/mdstat.cgi | 51 ++++++++++++++++++++++++ src/scripts/scanhd | 2 +- 6 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 html/cgi-bin/mdstat.cgi diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu index d71354043c..c0b780a062 100644 --- 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 c7262a5aed..be4648b0a8 100644 --- 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 9d0af8036d..8e21e3fd2f 100644 --- 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 aa73589817..d593cac254 100644 --- 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 index 0000000000..35c7debf8e --- /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 # +# # +# 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 . # +# # +############################################################################### + +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 ''; + +&Header::closebox(); + +&Header::closebigbox(); +&Header::closepage(); diff --git a/src/scripts/scanhd b/src/scripts/scanhd index ee946b7927..0d97d55303 100644 --- 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 -- 2.39.2