From 746a16651a2b38b02c4ebc528e73acc388eddcc2 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 12 Mar 2004 03:37:47 +0000 Subject: [PATCH] remove the setup flag git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1231 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/chcontext | 15 ++++++++------- util-vserver/scripts/vserver.start | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/util-vserver/scripts/chcontext b/util-vserver/scripts/chcontext index f0fe333..c1ffd07 100755 --- a/util-vserver/scripts/chcontext +++ b/util-vserver/scripts/chcontext @@ -134,13 +134,6 @@ create_cmd=( $_VCONTEXT --create ${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[@]}" @@ -149,6 +142,14 @@ test -z "$OPT_DOMAINNAME$OPT_HOSTNAME" || \ ${OPT_DOMAINNAME:+--domainname "$OPT_DOMAINNAME"} ${OPT_HOSTNAME:+--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} ) diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index 3973e1a..27ae30d 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -54,7 +54,7 @@ if $_VSERVER_INFO - FEATURE migrate; then $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \ $_VUNAME --dir "$VSERVER_DIR"/uts --missingok -- \ $_VUNAME --set --context -- "$VSERVER_DIR" \ - $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" -- \ + $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" --flag !setup -- \ $_VCONTEXT --migrate-self --chroot $SILENT_OPT "${OPTS_VCONTEXT_MIGRATE[@]}" -- \ "${INITCMD_START[@]}" else -- 1.8.1.5