From: Harald Dunkel <harald.dunkel@aixigo.de>
Date: Fri, 3 May 2013 08:53:43 +0000 (+0200)
Subject: support alternate container path in lxc-netstat.in
X-Git-Tag: lxc-1.0.0.alpha1~1^2~227
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c7ec7a8eded3d3864631165503fedb456e1b779;p=thirdparty%2Flxc.git

support alternate container path in lxc-netstat.in

Signed-off-by: Harald Dunkel <harald.dunkel@aixigo.de>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxc-netstat.in b/src/lxc/lxc-netstat.in
index 2fa2d23ae..d3eee1c22 100644
--- a/src/lxc/lxc-netstat.in
+++ b/src/lxc/lxc-netstat.in
@@ -17,8 +17,10 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
+. @DATADIR@/lxc/lxc.functions
+
 usage() {
-    echo "usage: $(basename $0) -n|--name <name> -- [netstat_options]" >&2
+    echo "usage: $(basename $0) -n|--name <name> [-P|--lxcpath <lxc_path>] -- [netstat_options]" >&2
 }
 
 help() {
@@ -26,8 +28,9 @@ help() {
     echo >&2
     echo "Execute 'netstat' for the specified container." >&2
     echo >&2
-    echo "  --name NAME       specify the container name" >&2
-    echo "  NETSTAT_OPTIONS   netstat command options (see \`netstat --help')" >&2
+    echo "  --name NAME               specify the container name" >&2
+    echo "  --lxcpath LXC_PATH        use an alternate container path" >&2
+    echo "  NETSTAT_OPTIONS           netstat command options (see \`netstat --help')" >&2
 }
 
 get_parent_cgroup()
@@ -73,6 +76,8 @@ while true; do
             help; exit 1;;
         -n|--name)
             name=$2; shift 2;;
+	-P|--lxcpath)
+            lxc_path="$2"; shift 2;;
         --exec)
             exec="exec"; shift;;
         --)
@@ -92,11 +97,17 @@ if [ -z "$name" ]; then
     exit 1
 fi
 
+if [ -z "$lxc_path" ]; then
+    echo "$(basename $0): no configuration path defined" >&2
+    usage
+    exit 1
+fi
+
 if [ -z "$exec" ]; then
-    exec @BINDIR@/lxc-unshare -s MOUNT -- $0 -n $name --exec "$@"
+    exec @BINDIR@/lxc-unshare -s MOUNT -- $0 -n $name -P "$lxc_path" --exec "$@"
 fi
 
-if lxc-info -n $name --state-is 'STOPPED'; then
+if lxc-info -n $name -P "$lxc_path" --state-is 'STOPPED'; then
     echo "$(basename $0): container '$name' is not running" >&2
     exit 1
 fi