Add -n differentiation to lxc-netstat

lxc-netstat now only processes an -n argument if it has not previously received a value for $name from --name or -n. If it _has_ received such a value, it stops processing arguments and leaves the -n for netstat. This does not apply to the use of --name after a name has been provided by --name or -n; the current behaviour continues. The new behaviour makes netstat -n <container> -n -a behave like netstat -n <container> -a -n which already will act as though there is '--' between '<container>' and '-a' (see line 91 of lxc-netstat.in). Signed-off-by: Andrew Gilbert <andrewg800@gmail.com> Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

Add -n differentiation to lxc-netstat
37cb98a2 · Andrew Gilbert · Serge Hallyn · 1a7cb085 · 37cb98a2
Commit 37cb98a2 authored Jun 27, 2013 by Andrew Gilbert Committed by Serge Hallyn Jun 27, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

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

No files found.
--- a/src/lxc/lxc-netstat.in
+++ b/src/lxc/lxc-netstat.in
@@ -74,7 +74,17 @@ while true; do
    case $1 in
        -h|--help)
            help; exit 1;;
-        -n|--name)
+        -n)
+            # If we already have a value for $name, treat -n as being an
+            # argument for netstat
+            if [ -n "$name" ]
+            then
+                break
+            else
+                name="$2"; shift 2;
+            fi
+            ;;
+        --name)
            name=$2; shift 2;;
 	-P|--lxcpath)
            lxc_path="$2"; shift 2;;