From: Enrico Scholz Date: Fri, 12 Mar 2004 19:30:27 +0000 (+0000) Subject: use new vuname syntax X-Git-Tag: VERSION_0_10~337 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e2a120c38a3fcd034bc6ed9e36a50accc3effcb;hp=105d8d6809ae85306c936e51d12903aec123bdc5;p=util-vserver.git use new vuname syntax git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1237 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/chcontext b/util-vserver/scripts/chcontext index c1ffd07..6b04ef3 100755 --- a/util-vserver/scripts/chcontext +++ b/util-vserver/scripts/chcontext @@ -131,19 +131,19 @@ done create_cmd=( $_VCONTEXT --create ${OPT_SILENT:+--silent} - ${OPT_CTX:+--xid "$OPT_CTX"} ) + ${OPT_CTX:+--xid "$OPT_CTX"} + -- ) chain_cmd=() 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[@]}"} diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index 27ae30d..ecb6795 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -52,8 +52,8 @@ if $_VSERVER_INFO - FEATURE migrate; then $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \ - $_VUNAME --dir "$VSERVER_DIR"/uts --missingok -- \ - $_VUNAME --set --context -- "$VSERVER_DIR" \ + $_VUNAME --xid self --dir "$VSERVER_DIR"/uts --missingok -- \ + $_VUNAME --xid self --set -t context="$VSERVER_DIR" -- \ $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" --flag !setup -- \ $_VCONTEXT --migrate-self --chroot $SILENT_OPT "${OPTS_VCONTEXT_MIGRATE[@]}" -- \ "${INITCMD_START[@]}"