X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fservices.cgi;h=22a9ac707cce13d072c261398fae6c9ed8a25234;hb=0cf124ab691a5502923ef69627b96069580861da;hp=424ca868f15161e1694d55217032080ddbc99ace;hpb=26906d98239bf79d9344e8f0796d5ca40d02ee73;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 424ca868f..22a9ac707 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -54,7 +54,7 @@ my %servicenames =(
 	$Lang::tr{'kernel logging server'} => 'klogd',
 	$Lang::tr{'ntp server'} => 'ntpd',
 	$Lang::tr{'secure shell server'} => 'sshd',
-	$Lang::tr{'vpn'} => 'pluto',
+	$Lang::tr{'vpn'} => 'charon',
 	$Lang::tr{'web proxy'} => 'squid',
 	'OpenVPN' => 'openvpn'
 );
@@ -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'}'>";
@@ -239,7 +240,7 @@ sub isrunning{
 	my $pid = '';
 	my $testcmd = '';
 	my $exename;
-	my @memory;
+	my $memory;
 
 	$cmd =~ /(^[a-z]+)/;
 	$exename = $1;
@@ -255,13 +256,18 @@ sub isrunning{
 			}
 			close FILE;
 		}
-		if (open(FILE, "/proc/${pid}/statm")){
-				my $temp = <FILE>;
-				@memory = split(/ /,$temp);
+		if (open(FILE, "/proc/${pid}/status")) {
+			while (<FILE>) {
+				my ($key, $val) = split(":", $_, 2);
+				if ($key eq 'VmRSS') {
+					$memory = $val;
+					last;
+				}
+			}
+			close(FILE);
 		}
-		close FILE;
 		if ($testcmd =~ /$exename/){
-			$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td><td align='center'>$pid</td><td align='center'>$memory[0] KB</td>";
+			$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td><td align='center'>$pid</td><td align='center'>$memory</td>";
 		}
 	}
 	return $status;
@@ -279,6 +285,7 @@ sub isrunningaddon{
 
 	if ( $testcmd =~ /is\ running/ && $testcmd !~ /is\ not\ running/){
 		$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
+		$testcmd =~ s/.* //gi;
 		$testcmd =~ s/[a-z_]//gi;
 		$testcmd =~ s/\[[0-1]\;[0-9]+//gi;
 		$testcmd =~ s/[\(\)\.]//gi;