Merge branch 'master' into kernel38

This commit is contained in:
Arne Fitzenreiter
2011-04-18 23:27:27 +02:00
2 changed files with 3 additions and 1 deletions

View File

@@ -8,6 +8,7 @@ srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/services.cgi
var/ipfire/langs/de.pl
var/ipfire/langs/en.pl
var/ipfire/langs/es.pl

View File

@@ -177,9 +177,10 @@ END
# blacklist some packages
#
# alsa has trouble with the volume saving and was not really stopped
# mdadm should not stopped with webif because this could crash the system
#
chomp($_);
if ($_ ne "alsa"){
if ( ($_ ne "alsa") && ($_ ne "mdadm") ) {
$lines++;
if ($lines % 2){
print "<tr bgcolor='$color{'color22'}'>";