From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 21 Jul 2012 21:54:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into kernel-update
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=b431bfce486adcccac747c21882a6f735583104e;hp=-c

Merge remote-tracking branch 'origin/master' into kernel-update
---

b431bfce486adcccac747c21882a6f735583104e
diff --combined html/cgi-bin/services.cgi
index 58d0a1dbc,123c32587..22a9ac707
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@@ -54,7 -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'
  );
@@@ -240,7 -240,7 +240,7 @@@ sub isrunning
  	my $pid = '';
  	my $testcmd = '';
  	my $exename;
- 	my @memory;
+ 	my $memory;
  
  	$cmd =~ /(^[a-z]+)/;
  	$exename = $1;
@@@ -256,13 -256,18 +256,18 @@@
  			}
  			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;