X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fchcontext;h=6b04ef30acb77401f414822fc97cd2557a65cf48;hb=4e2a120c38a3fcd034bc6ed9e36a50accc3effcb;hp=dbb7ab43372dfaa5115232d25951acfaef64e505;hpb=0478159dc2db320457f3d7da97a0d0dace0cce05;p=util-vserver.git diff --git a/util-vserver/scripts/chcontext b/util-vserver/scripts/chcontext index dbb7ab4..6b04ef3 100755 --- a/util-vserver/scripts/chcontext +++ b/util-vserver/scripts/chcontext @@ -131,24 +131,25 @@ done create_cmd=( $_VCONTEXT --create ${OPT_SILENT:+--silent} - ${OPT_CTX:+--xid "$OPT_CTX"} ) + ${OPT_CTX:+--xid "$OPT_CTX"} + -- ) chain_cmd=() -test -z "$OPT_CAPS$OPT_FLAGS$OPT_SECURE" || \ - chain_cmd=( "${chain_cmd[@]}" - -- - $_VATTRIBUTE --set - ${OPT_CAPS:+--cap "${OPT_CAPS[@]}"} - ${OPT_FLAGS:+--flag "${OPT_FLAGS[@]}"} - ${OPT_SECURE:+--secure} ) test -z "$OPT_DOMAINNAME$OPT_HOSTNAME" || \ chain_cmd=( "${chain_cmd[@]}" - -- - $_VUNAME -s - ${OPT_DOMAINNAME:+--domainname "$OPT_DOMAINNAME"} - ${OPT_HOSTNAME:+--nodename "$OPT_HOSTNAME"} ) + $_VUNAME --set + --xid self + ${OPT_DOMAINNAME:+-t domainname="$OPT_DOMAINNAME"} + ${OPT_HOSTNAME:+-t nodename="$OPT_HOSTNAME"} ) +chain_cmd=( "${chain_cmd[@]}" + $_VATTRIBUTE --set + ${OPT_CAPS:+--cap "${OPT_CAPS[@]}"} + ${OPT_FLAGS:+--flag "${OPT_FLAGS[@]}"} + ${OPT_SECURE:+--secure} + --flag !setup ) + migrate_cmd=( $_VCONTEXT ${OPT_SILENT:+--silent} ${OPT_DISCONNECT:+--disconnect} ) @@ -156,5 +157,5 @@ migrate_cmd=( $_VCONTEXT "${create_cmd[@]}" "${chain_cmd[@]}" -- "${migrate_cmd[@]}" --migrate-self -- "$@" rc=$? -test "$rc" -ne 254 || exec "${migrate_cmd[@]}" --migrate -- "$@" +test "$rc" -ne 254 || exec "${migrate_cmd[@]}" --xid "$OPT_CTX" --migrate -- "$@" exit $rc