From: Serge E. Hallyn <serge.hallyn@canonical.com>
Date: Tue, 9 Aug 2011 14:51:01 +0000 (+0200)
Subject: lxc-ps: support '-n name' and '-- ps-options'
X-Git-Tag: lxc-0.7.5~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3729572b4b198c61642540afdf278244e2bd5f29;p=thirdparty%2Flxc.git

lxc-ps: support '-n name' and '-- ps-options'

This is more consistent with other lxc commands

Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/820720

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/lxc-ps.in b/src/lxc/lxc-ps.in
index 7b3c8ab36..dd3b7fe39 100755
--- a/src/lxc/lxc-ps.in
+++ b/src/lxc/lxc-ps.in
@@ -134,7 +134,7 @@ sub display_headers {
 
 sub display_usage {
     print <<EOF;
-Usage: lxc-ps [--help] [--usage] [--name NAME...] [--lxc] [ps options]
+Usage: lxc-ps [--help] [--usage] [-n|--name NAME...] [--lxc] [-- ps options]
 EOF
 }
 
@@ -157,7 +157,7 @@ or try a 'ps --help' for further details.
 EOF
 }
 
-use Getopt::Long qw(:config no_auto_abbrev pass_through);
+use Getopt::Long qw(:config pass_through);
 
 my $arg_help  = '';
 my $arg_usage = '';
@@ -175,6 +175,10 @@ GetOptions('help'   => \$arg_help,
 if ($arg_help)  {display_help; exit 0;}
 if ($arg_usage) {display_usage; exit 0;}
 
+if ($ARGV[0] == '--') {
+	shift @ARGV;
+}
+
 # Should we filter processes related to containers
 if ($arg_lxc) {
 	$LXC_DISPLAY = 1;