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>

fix netstat script with separator
21e487f2 · Daniel Baumann · Daniel Lezcano · 5548f218 · 21e487f2
Commit 21e487f2 authored Jul 31, 2012 by Daniel Baumann Committed by Daniel Lezcano Jul 31, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 5 deletions

lxc-netstat.in src/lxc/lxc-netstat.in +11 -5

No files found.
--- 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,13 +67,19 @@ get_parent_cgroup()
 	done
 }

-exec=""
+shortoptions='hn:'
+longoptions='help,name:,exec'

-if [ $# -eq  0 ]; then
-	usage
-	exit 1
+getopt=$(getopt -o $shortoptions --longoptions  $longoptions -- "$@")
+if [ $? != 0 ]; then
+    usage
+    exit 1;
 fi

+exec=""
+
+eval set -- "$getopt"
+
 while true; do
 	case $1 in
 		-h|--help)