fix lxc-ps to work with systemd

Dear all, while working with systemd I found that lxc-ps -efa does not recognize the container name. Best regards Joerg Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

fix lxc-ps to work with systemd
c011782c · Joerg Gollnick · Daniel Lezcano · bcbd102c · c011782c
Commit c011782c authored Jul 25, 2011 by Joerg Gollnick Committed by Daniel Lezcano Jul 25, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 7 deletions

lxc-ps.in src/lxc/lxc-ps.in +12 -7

No files found.
--- a/src/lxc/lxc-ps.in
+++ b/src/lxc/lxc-ps.in
@@ -37,7 +37,7 @@ our %LXC_NAMES;       # Specified container names (if any)

 sub get_container_names {
 	my $ref_names = shift;
-	my $lxcpath='@LXCPATH@';
+	my $lxcpath = '@LXCPATH@';

 	open(active, "netstat -xa | grep $lxcpath |") or return;
 	while(<active>) {
@@ -112,13 +112,18 @@ sub get_container {
    my $pid = shift;
    my $filename = "/proc/$pid/cgroup";
    open(LXC, "$filename");
-    my $container = <LXC>;
+    # read all lines at once
+    my @cgroup = <LXC>;
    close LXC;
-    chomp($container);
-    if ($container =~ m/[:,]ns[:,]/o) {
-    	$container =~ s/.*:\///o;
-    } else {
-	$container ='';
+    my $container = '';
+    foreach ( @cgroup ) {
+        chomp;
+        # find the container name
+        if (m/[:,]ns[:,]/o) {
+	    # container name after :/
+	    s/.*:\///o;
+            $container = $_;
+        }
    }
    return $container;
 }