X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fchcontext;h=d30f6453b809a9fa12449639eeefcc2479851070;hb=dbbb75087e2a59a419e8c3ef76458f3262dfe8cd;hp=9fa67cda3ac447c412ae9cf0e86ffe4a57a0e621;hpb=9c78378bebc1a9f3d400f422df8ede9efea57dea;p=util-vserver.git diff --git a/scripts/chcontext b/scripts/chcontext index 9fa67cd..d30f645 100755 --- a/scripts/chcontext +++ b/scripts/chcontext @@ -27,7 +27,7 @@ test -e "$UTIL_VSERVER_VARS" || { function showHelp() { echo \ -$"Usage: /usr/sbin/chcontext [--cap [!]] [--secure] [--xid ] [--disconnect] +$"Usage: $1 [--cap [!]] [--secure] [--xid ] [--disconnect] [--domainname ] [--hostname ] [--flag +] [--silent] [--] command arguments ... @@ -84,7 +84,7 @@ By default, a new/unused context is allocated Do not print the allocated context number. Report bugs to <$PACKAGE_BUGREPORT>." - exit $1 + exit $2 } function showVersion() @@ -101,7 +101,7 @@ the GNU General Public License. This program has absolutely no warranty." $_VSERVER_INFO - FEATURE migrate || exec $_CHCONTEXT_COMPAT "$@" -tmp=$(getopt -o + --long cap:,ctx:,xid:,disconnect,domainname:,flag:,hostname:,secure,silent,help,version -n "$0" -- "$@") || exit 1 +tmp=$(getopt -o + --long cap:,ctx:,xid:,disconnect,domainname:,flag:,hostname:,secure,silent,help,version,spaces: -n "$0" -- "$@") || exit 1 eval set -- "$tmp" OPT_CAPS=() @@ -111,11 +111,12 @@ OPT_FLAGS=() OPT_SECURE= OPT_SILENT= OPT_INITPID= +OPT_SPACES=--default while true; do case "$1" in - --help) showHelp $0 ;; - --version) showVersion ;; + --help) showHelp $0 0;; + --version) showVersion 0;; --cap) OPT_CAPS=( "${OPT_CAPS[@]}" "$2" ); shift;; --ctx|--xid) OPT_CTX=$2; shift;; --disconnect) OPT_DISCONNECT=1;; @@ -128,13 +129,16 @@ while true; do ;; --secure) OPT_SECURE=1;; --silent) OPT_SILENT=1;; + --spaces) OPT_SPACES=$2; shift;; --) shift; break;; *) echo $"chcontext: internal error; arg=='$1'" >&2; exit 1;; esac shift done -create_cmd=( $_VCONTEXT --create --silentexist +create_cmd=( ${OPT_CTX:+$_VTAG --create --tag "$OPT_CTX" --silentexist --silent --} + $_VSPACE --new $OPT_SPACES -- + $_VCONTEXT --create --silentexist ${OPT_SILENT:+--silent} ${OPT_CTX:+--xid "$OPT_CTX"} ) @@ -143,6 +147,10 @@ chain_cmd=() old_IFS=$IFS IFS=,$IFS +chain_cmd=( "${chain_cmd[@]}" + -- + $_VSPACE --set $OPT_SPACES ) + test -z "$OPT_DOMAINNAME$OPT_HOSTNAME" || \ chain_cmd=( "${chain_cmd[@]}" -- @@ -153,9 +161,9 @@ test -z "$OPT_DOMAINNAME$OPT_HOSTNAME" || \ chain_cmd=( "${chain_cmd[@]}" -- $_VATTRIBUTE --set + ${OPT_SECURE:+--secure} ${OPT_CAPS:+--bcap "${OPT_CAPS[*]}"} - ${OPT_FLAGS:+--flag "${OPT_FLAGS[*]}"} - ${OPT_SECURE:+--secure} ) + ${OPT_FLAGS:+--flag "${OPT_FLAGS[*]}"} ) migrate_cmd=( $_VCONTEXT ${OPT_SILENT:+--silent} @@ -164,7 +172,12 @@ migrate_cmd=( $_VCONTEXT IFS=$old_IFS -if test -z "$OPT_CTX" || $_VSERVER_INFO -q "$OPT_CTX" XIDTYPE static; then +$_VSERVER_INFO -q "$OPT_CTX" XIDTYPE static +is_static=$? +test -z "$OPT_CTX" +is_dynamic=$? + +if test "$is_dynamic" -eq 0 || test "$is_static" -eq 0; then "${create_cmd[@]}" "${chain_cmd[@]}" -- \ "${migrate_cmd[@]}" --endsetup --migrate-self -- "$@" rc=$? @@ -172,5 +185,13 @@ else rc=254 fi -test "$rc" -ne 254 || exec "${migrate_cmd[@]}" --xid "$OPT_CTX" --migrate -- "$@" +if test "$is_static" -eq 0; then + migrate_cmd=( $_VTAG --migrate --tag "$OPT_CTX" --silent -- \ + $_VSPACE --enter "$OPT_CTX" $OPT_SPACES -- \ + "${migrate_cmd[@]}" ) +fi + + +test "$rc" -ne 254 || exec "${migrate_cmd[@]}" --xid "$OPT_CTX" --migrate -- \ + "$@" exit $rc