From 2b0f9af025fc652a215f047ac6b79196d2ea4a95 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 13 Mar 2004 02:55:23 +0000 Subject: [PATCH] applied new CLI git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1242 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/chcontext | 29 ++++++++++++++++++----------- util-vserver/scripts/vserver.start | 4 ++-- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/util-vserver/scripts/chcontext b/util-vserver/scripts/chcontext index 6b04ef3..ea42ad8 100755 --- a/util-vserver/scripts/chcontext +++ b/util-vserver/scripts/chcontext @@ -110,6 +110,7 @@ OPT_DISCONNECT= OPT_FLAGS=() OPT_SECURE= OPT_SILENT= +OPT_FAKEINIT= while true; do case "$1" in @@ -120,7 +121,12 @@ while true; do --disconnect) OPT_DISCONNECT=1;; --domainname) OPT_DOMAINNAME=$2; shift;; --hostname) OPT_HOSTNAME=$2; shift;; - --flag) OPT_FLAGS=( "${OPT_FLAGS[@]}" "$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;; @@ -131,30 +137,31 @@ 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 --set - --xid self + -- + $_VUNAME --set --xid self ${OPT_DOMAINNAME:+-t domainname="$OPT_DOMAINNAME"} - ${OPT_HOSTNAME:+-t nodename="$OPT_HOSTNAME"} ) + ${OPT_HOSTNAME:+ -t nodename="$OPT_HOSTNAME"} ) chain_cmd=( "${chain_cmd[@]}" + -- $_VATTRIBUTE --set - ${OPT_CAPS:+--cap "${OPT_CAPS[@]}"} + ${OPT_CAPS:+--bcap "${OPT_CAPS[@]}"} ${OPT_FLAGS:+--flag "${OPT_FLAGS[@]}"} - ${OPT_SECURE:+--secure} - --flag !setup ) + ${OPT_SECURE:+--secure} ) migrate_cmd=( $_VCONTEXT ${OPT_SILENT:+--silent} - ${OPT_DISCONNECT:+--disconnect} ) + ${OPT_DISCONNECT:+--disconnect} + $OPT_FAKEINIT ) -"${create_cmd[@]}" "${chain_cmd[@]}" -- "${migrate_cmd[@]}" --migrate-self -- "$@" +"${create_cmd[@]}" "${chain_cmd[@]}" -- \ + "${migrate_cmd[@]}" --endsetup --migrate-self -- "$@" rc=$? test "$rc" -ne 254 || exec "${migrate_cmd[@]}" --xid "$OPT_CTX" --migrate -- "$@" diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index ecb6795..5070f58 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -54,8 +54,8 @@ if $_VSERVER_INFO - FEATURE migrate; then $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \ $_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[@]}" -- \ + $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" -- \ + $_VCONTEXT --migrate-self --endsetup --chroot $SILENT_OPT "${OPTS_VCONTEXT_MIGRATE[@]}" -- \ "${INITCMD_START[@]}" else ${NICE_CMD[@]} \ -- 1.8.1.5