X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fchcontext;h=ea42ad8d2e5b9f8f7b183133664a5d29d9da0850;hb=552047c69c293485ce2401ae8bc0c0894b2fb410;hp=41f1582d830041197be330db0bf1e43eec87693e;hpb=66ff8eb2e4f7e51fab7bf0eae4a756c9f54b7132;p=util-vserver.git diff --git a/util-vserver/scripts/chcontext b/util-vserver/scripts/chcontext index 41f1582..ea42ad8 100755 --- a/util-vserver/scripts/chcontext +++ b/util-vserver/scripts/chcontext @@ -93,22 +93,12 @@ function showVersion() $"chcontext $PACKAGE_VERSION -- allocates/enters a security context This program is part of $PACKAGE_STRING -Copyright (C) 2003 Enrico Scholz +Copyright (C) 2004 Enrico Scholz This program is free software; you may redistribute it under the terms of the GNU General Public License. This program has absolutely no warranty." exit $1 } -function cleanup() -{ - if test -d "$tmpdir"; then - local S="$tmpdir"/socket - test ! -S "$S" || $_KEEP_CTX_ALIVE --quit "$S" &>/dev/null - rm -rf "$tmpdir" - fi -} - - $_VSERVER_INFO - FEATURE migrate || exec $_CHCONTEXT_COMPAT "$@" tmp=$(getopt -o + --long cap:,ctx:,disconnect,domainname:,flag:,hostname:,secure,silent,help,version -n "$0" -- "$@") || exit 1 @@ -120,17 +110,23 @@ OPT_DISCONNECT= OPT_FLAGS=() OPT_SECURE= OPT_SILENT= +OPT_FAKEINIT= while true; do case "$1" in --help) showHelp $0 ;; --version) showVersion ;; - --cap) OPT_CAPS=( "${OPT_CAPS[@]}" "$1" ); shift;; - --ctx) OPT_CTX=$1; shift;; - --disconnect) OPT_DISCONNECT=1; - --domainname) OPT_DOMAINNAME=$1; shift;; - --hostname) OPT_HOSTNAME=$1; shift;; - --flag) OPT_FLAGS=( "${OPT_FLAGS[@]}" "$1" ); shift;; + --cap) OPT_CAPS=( "${OPT_CAPS[@]}" "$2" ); shift;; + --ctx) OPT_CTX=$2; shift;; + --disconnect) OPT_DISCONNECT=1;; + --domainname) OPT_DOMAINNAME=$2; shift;; + --hostname) OPT_HOSTNAME=$2; shift;; + --flag) + test "$2" = "fakeinit" && \ + OPT_FAKEINIT=--fakeinit || + OPT_FLAGS=( "${OPT_FLAGS[@]}" "$2" ) + shift + ;; --secure) OPT_SECURE=1;; --silent) OPT_SILENT=1;; --) shift; break;; @@ -139,42 +135,34 @@ while true; do shift done -tmpdir= -tmpdir=$(mktemp -d /tmp/chcontext.XXXXXX) -trap "cleanup" EXIT - -xid=$($_VCONTEXT --create ${OPT_SILENT:+--silent} ${OPT_CTX:+--xid "$OPT_CTX"} -- $_CTX_KEEP_ALIVE --socket "$tmpdir"/socket --timeout 60) +create_cmd=( $_VCONTEXT --create + ${OPT_SILENT:+--silent} + ${OPT_CTX:+--xid "$OPT_CTX"} ) + +chain_cmd=() + +test -z "$OPT_DOMAINNAME$OPT_HOSTNAME" || \ + chain_cmd=( "${chain_cmd[@]}" + -- + $_VUNAME --set --xid self + ${OPT_DOMAINNAME:+-t domainname="$OPT_DOMAINNAME"} + ${OPT_HOSTNAME:+ -t nodename="$OPT_HOSTNAME"} ) + +chain_cmd=( "${chain_cmd[@]}" + -- + $_VATTRIBUTE --set + ${OPT_CAPS:+--bcap "${OPT_CAPS[@]}"} + ${OPT_FLAGS:+--flag "${OPT_FLAGS[@]}"} + ${OPT_SECURE:+--secure} ) + +migrate_cmd=( $_VCONTEXT + ${OPT_SILENT:+--silent} + ${OPT_DISCONNECT:+--disconnect} + $OPT_FAKEINIT ) + +"${create_cmd[@]}" "${chain_cmd[@]}" -- \ + "${migrate_cmd[@]}" --endsetup --migrate-self -- "$@" rc=$? -test "$rc" -ne 255 || - echo $"chcontext: Failed to create the context; aborting..." >&2 - exit 1 -} - -test "$rc" -ne 254 || xid=$OPT_CTX -test "$xid" || { - echo $"chcontext: Failed to determine context xid; aborting..." >&2 - exit 1 -} - -set -e -test "$rc" -ne 0 || { - rm -rf "$tmpdir" - unset rc -} -if test "$rc" -ne 254; then - $_VATTRIBUTE --xid "$xid" -s \ - ${OPT_CAPS:+--cap "${OPT_CAPS[@]}"} - ${OPT_FLAGS:+--flag "${OPT_FLAGS[@]}"} \ - ${OPT_SECURE:+--secure} - - $_VUNAME --xid "$xid" -s \ - ${OPT_DOMAINNAME:+--domainname "$OPT_DOMAINNAME"} \ - ${OPT_HOSTNAME:+--nodename "$OPT_HOSTNAME"} -fi - -exec $_VCONTEXT --migrate --xid "$xid" \ - ${OPT_SILENT:+--silent} \ - ${OPT_DISCONNECT:+--disconnect} \ - ${rc:--syncsock "$tmpdir"/socket} \ - -- "$@" +test "$rc" -ne 254 || exec "${migrate_cmd[@]}" --xid "$OPT_CTX" --migrate -- "$@" +exit $rc