[lxc-devel] [PATCH 2/2] allow short -h and -n options to lxc-ps

[Stéphane Graber]

On 12-09-18 03:58 PM, Dwight Engen wrote:
> ---
>  doc/lxc-ps.sgml.in |    4 ++--
>  src/lxc/lxc-ps.in  |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)

Looks good. Applied to staging.

Thanks


> diff --git a/doc/lxc-ps.sgml.in b/doc/lxc-ps.sgml.in
> index f3275ae..401a17c 100644
> --- a/doc/lxc-ps.sgml.in
> +++ b/doc/lxc-ps.sgml.in
> @@ -51,7 +51,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
>        <command>lxc-ps</command>
>        <arg choice="opt">--name <replaceable>name</replaceable></arg>
>        <arg choice="opt">--lxc</arg>
> -      <arg choice="opt">ps option</arg>
> +      <arg choice="opt">-- ps option</arg>
>      </cmdsynopsis>
>    </refsynopsisdiv>
>  
> @@ -81,7 +81,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
>  
>        <varlistentry>
>  	<term>
> -	  <option>--name <replaceable>name</replaceable></option>
> +	  <option>-n, --name <replaceable>name</replaceable></option>
>  	</term>
>  	<listitem>
>  	  <para>
> diff --git a/src/lxc/lxc-ps.in b/src/lxc/lxc-ps.in
> index a9923f0..4180aae 100644
> --- a/src/lxc/lxc-ps.in
> +++ b/src/lxc/lxc-ps.in
> @@ -74,9 +74,9 @@ containers=""
>  list_container_processes=0
>  for i in "$@"; do
>  	case $i in
> -		--help)
> +		-h|--help)
>  			help; exit 1;;
> -		--name)
> +		-n|--name)
>  			containers=$2; list_container_processes=1; shift 2;;
>  		--lxc)
>  			list_container_processes=1; shift;;
> 


-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 897 bytes
Desc: OpenPGP digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20120919/c32069a1/attachment.pgp>