mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-23 17:32:57 +02:00
Merge branch 'master' into kernel38
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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'}'>";
|
||||
|
||||
Reference in New Issue
Block a user