Merge remote-tracking branch 'amarx/BUG10797' into next

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 6bfa5bbbe81a5607b91deb6991a70b0ee055e72c..76bd9edebc048213fe2040ae0bba11267ef8fefb 100644 (file)
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -188,6 +188,9 @@ END
                        # mdadm should not stopped with webif because this could crash the system
                        #
                        chomp($_);
+                       if ( $_ eq 'squid' ) {
+                               next;
+                       }
                        if ( ($_ ne "alsa") && ($_ ne "mdadm") ) {
                                $lines++;
                                if ($lines % 2){