From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 13 Apr 2015 09:28:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'amarx/BUG10797' into next
X-Git-Tag: v2.17-core91~137
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=32a5fec71c317aa47ad27abecd3a63bda513972b;hp=ad50a299c8717ffdd3a0ec02b0db40888f5d9e73

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

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 6bfa5bbbe8..76bd9edebc 100644
--- 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){