X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fchcontext;h=ea42ad8d2e5b9f8f7b183133664a5d29d9da0850;hb=279cb52f0c4223be8e0b2a8411b8ff66368eb971;hp=c1ffd07e6d9c09ab480fcbf77049338cced28727;hpb=746a16651a2b38b02c4ebc528e73acc388eddcc2;p=util-vserver.git diff --git a/util-vserver/scripts/chcontext b/util-vserver/scripts/chcontext index c1ffd07..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;; @@ -138,23 +144,24 @@ 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_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 -- "$@"