Merge branch 'master' into kernel38

diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files
index 8fc42ba292a2c87b2208b940e115dfc0b52dc5c3..9d0af8036d5ef08fa6781a49ece721c4300ecbea 100644 (file)
--- a/config/rootfiles/core/49/filelists/files
+++ b/config/rootfiles/core/49/filelists/files
@@ -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

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index b6efe095849431c112ab8d36bd488833aaa829d5..55740cf26dbd56b3bb20234329e6206465cdd473 100644 (file)
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -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'}'>";