webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 02:55:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into kernel38

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-04-26 08:51:24 +02:00
parent b5e9f17b66 339dbffc70
commit afbb5d0a18
10 changed files with 78 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/menu/20-status.menu
View File

@@ -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,
};

1
config/rootfiles/common/apache2
View File

@@ -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

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

@@ -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

5
config/rootfiles/packages/mdadm
View File

@@ -1,4 +1,6 @@
lib/udev/rules.d
etc/rc.d/rc0.d/S85mdadm
etc/rc.d/rc6.d/S75mdadm
etc/rc.d/rcsysinit.d/S11mdadm
lib/udev/rules.d/64-md-raid.rules
sbin/mdadm
sbin/mdmon
@@ -7,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

2
html/cgi-bin/extrahd.cgi
View File

@@ -202,7 +202,7 @@ END
foreach $partitionentry (sort @partitions)
{
@partitionline = split( /\;/, $partitionentry );
if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && !( "$partitionline[2]" == "" )) {
if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && !( "$partitionline[2]" eq "" )) {
$size = int($partitionline[1] / 1024);
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>

51
html/cgi-bin/mdstat.cgi Normal file
View File

@@ -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();

11
lfs/mdadm
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-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 #
@@ -24,7 +24,7 @@
include Config
VER = 3.1.1
VER = 3.2.1
THISAPP = mdadm-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mdadm
PAK_VER = 1
PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4fd8e375a2ee314becd3196c1a250d98
$(DL_FILE)_MD5 = d1e2549202bd79d9e99f1498d1109530
install : $(TARGET)
@@ -79,5 +79,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
ln -sf ../init.d/mdadm /etc/rc.d/rcsysinit.d/S11mdadm
ln -sf ../init.d/mdadm /etc/rc.d/rc0.d/S85mdadm
ln -sf ../init.d/mdadm /etc/rc.d/rc6.d/S75mdadm
@rm -rf $(DIR_APP)
@$(POSTBUILD)

25
src/initscripts/init.d/mdadm
View File

@@ -1,6 +1,6 @@
#!/bin/sh
########################################################################
# Begin $rc_base/init.d/mdadmraid
# Begin $rc_base/init.d/mdadm
#
# Description : This script controls software Raid
#
@@ -17,28 +17,15 @@
case "${1}" in
start)
if [ -f /etc/mdadm.conf ]
then
boot_mesg "Starting Raid devices..."
modprobe md
modprobe raid0
modprobe raid1
modprobe raid5
sleep 1
mdadm --assemble --scan
else
boot_mesg "Skipping raid devices, no config found..."
exit 1
fi
boot_mesg "Scan/assemble mdadm raid devices..."
mdadm --assemble --scan
echo_ok
;;
stop)
boot_mesg "Stopping Raid devices..."
mdadm --stop --scan
echo_ok
;;
restart)
@@ -57,4 +44,4 @@ case "${1}" in
;;
esac
# End $rc_base/init.d/mdadmraid
# End $rc_base/init.d/mdadm

5
src/initscripts/init.d/waitdrives
View File

@@ -26,11 +26,6 @@ check_drives () {
case "${1}" in
start)
if [ -e /sbin/mdadm ]; then
boot_mesg "Assemble mdadm managed raid-drives ..."
mdadm --assemble --scan
fi
drives=`grep "^UUID=" /etc/fstab | cut -f1 | cut -d" " -f1 | cut -d"=" -f2`;
check_drives;

4
src/scripts/scanhd
View File

@@ -3,8 +3,8 @@
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/md ]; then
echo 'md;"MDADM software-raid";' >> /var/ipfire/extrahd/scan
if [ -e /dev/.mdadm ]; then
echo 'md;"MD Software-Raid";' >> /var/ipfire/extrahd/scan
fi
if [ -e /dev/mmcblk0 ]; then
echo 'mmcblk0;"MMC/SD Cardreader";' >> /var/ipfire/extrahd/scan