Commit 7c7ec7a8 by Harald Dunkel Committed by Serge Hallyn

support alternate container path in lxc-netstat.in

parent 8ee3042a
...@@ -17,8 +17,10 @@ ...@@ -17,8 +17,10 @@
# License along with this library; if not, write to the Free Software # License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
. @DATADIR@/lxc/lxc.functions
usage() { 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() { help() {
...@@ -27,6 +29,7 @@ help() { ...@@ -27,6 +29,7 @@ help() {
echo "Execute 'netstat' for the specified container." >&2 echo "Execute 'netstat' for the specified container." >&2
echo >&2 echo >&2
echo " --name NAME specify the container name" >&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 echo " NETSTAT_OPTIONS netstat command options (see \`netstat --help')" >&2
} }
...@@ -73,6 +76,8 @@ while true; do ...@@ -73,6 +76,8 @@ while true; do
help; exit 1;; help; exit 1;;
-n|--name) -n|--name)
name=$2; shift 2;; name=$2; shift 2;;
-P|--lxcpath)
lxc_path="$2"; shift 2;;
--exec) --exec)
exec="exec"; shift;; exec="exec"; shift;;
--) --)
...@@ -92,11 +97,17 @@ if [ -z "$name" ]; then ...@@ -92,11 +97,17 @@ if [ -z "$name" ]; then
exit 1 exit 1
fi fi
if [ -z "$lxc_path" ]; then
echo "$(basename $0): no configuration path defined" >&2
usage
exit 1
fi
if [ -z "$exec" ]; then 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 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 echo "$(basename $0): container '$name' is not running" >&2
exit 1 exit 1
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment