From 21e487f256705638cbfbd584e33021b9b2db504a Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-technologies.net>
Date: Tue, 31 Jul 2012 16:01:24 +0200
Subject: [PATCH] fix netstat script with separator

Allow to use -- as seperator in lxc-netstat, otherwise -n from lxc-netstat
collides with netstats -n option (Closes: #641251).
[Serge Hallyn] update patch to (1) not demand argument for
 exec (breaks) and  (2) set $name not $lxc_name.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
 src/lxc/lxc-netstat.in | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/lxc/lxc-netstat.in b/src/lxc/lxc-netstat.in
index 113c0dac3..367568c2e 100644
--- a/src/lxc/lxc-netstat.in
+++ b/src/lxc/lxc-netstat.in
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 usage() {
-	echo "usage: $(basename $0) --name NAME [--] [NETSTAT_OPTIONS...]" >&2
+	echo "usage: $(basename $0) -n|--name <name> -- [netstat_options]" >&2
 }
 
 help() {
@@ -67,12 +67,18 @@ get_parent_cgroup()
 	done
 }
 
+shortoptions='hn:'
+longoptions='help,name:,exec'
+
+getopt=$(getopt -o $shortoptions --longoptions  $longoptions -- "$@")
+if [ $? != 0 ]; then
+    usage
+    exit 1;
+fi
+
 exec=""
 
-if [ $# -eq  0 ]; then
-	usage
-	exit 1
-fi
+eval set -- "$getopt"
 
 while true; do
 	case $1 in