From cbe9adb0193aa8fc299501484bc46534a38d3d4a Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 12 Mar 2004 02:59:47 +0000 Subject: [PATCH] fixed params do not call vuname/vattribute when not needed git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1220 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/chcontext | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/util-vserver/scripts/chcontext b/util-vserver/scripts/chcontext index 76e030b..ed12f8b 100755 --- a/util-vserver/scripts/chcontext +++ b/util-vserver/scripts/chcontext @@ -131,25 +131,30 @@ done create_cmd=( $_VCONTEXT --create ${OPT_SILENT:+--silent} - ${OPT_CTX:+--xid "$OPT_CTX"} - -- ) - -chain_cmd=( $_VATTRIBUTE -s - ${OPT_CAPS:+--cap "${OPT_CAPS[@]}"} - ${OPT_FLAGS:+--flag "${OPT_FLAGS[@]}"} - ${OPT_SECURE:+--secure} - -- - $_VUNAME -s - ${OPT_DOMAINNAME:+--domainname "$OPT_DOMAINNAME"} - ${OPT_HOSTNAME:+--nodename "$OPT_HOSTNAME"} - -- ) + ${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"} ) migrate_cmd=( $_VCONTEXT --migrate-self ${OPT_SILENT:+--silent} ${OPT_DISCONNECT:+--disconnect} -- "$@" ) -"${create_cmd[@]}" "${chain_cmd[@]}" "${migrate_cmd[@]}" +"${create_cmd[@]}" "${chain_cmd[@]}" -- "${migrate_cmd[@]}" rc=$? test "$rc" -ne 254 || exec "${migrate_cmd[@]}" -- 1.8.1.5