From 996982ec36d2db18489dce2a00951fbece220bb7 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 10 Mar 2004 02:34:08 +0000 Subject: [PATCH] use '--' delimiter git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1195 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/chcontext | 8 +++++--- util-vserver/scripts/vserver.start | 16 ++++++++-------- util-vserver/scripts/vserver.stop | 10 +++++----- util-vserver/scripts/vserver.suexec | 6 +++--- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/util-vserver/scripts/chcontext b/util-vserver/scripts/chcontext index 8ea6f62..76e030b 100755 --- a/util-vserver/scripts/chcontext +++ b/util-vserver/scripts/chcontext @@ -131,16 +131,18 @@ done create_cmd=( $_VCONTEXT --create ${OPT_SILENT:+--silent} - ${OPT_CTX:+--xid "$OPT_CTX"} ) + ${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_HOSTNAME:+--nodename "$OPT_HOSTNAME"} + -- ) migrate_cmd=( $_VCONTEXT --migrate-self ${OPT_SILENT:+--silent} diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index 199596c..f4b4b81 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -47,14 +47,14 @@ execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-start cd "$VSERVER_DIR"/vdir/ if $_VSERVER_INFO - FEATURE migrate; then - $_CHBIND "${CHBIND_OPTS[@]}" \ - $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" \ - ${USE_VNAMESPACE:+$_VNAMESPACE --set} \ - $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok \ - $_VUNAME --dir "$VSERVER_DIR"/uts --missingok \ - $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" \ - $_VCONTEXT --migrate-self --chroot $SILENT_OPT "${OPTS_VCONTEXT_MIGRATE[@]}" \ - -- "${INITCMD_START[@]}" + $_CHBIND "${CHBIND_OPTS[@]}" -- \ + $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ + ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ + $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \ + $_VUNAME --dir "$VSERVER_DIR"/uts --missingok -- \ + $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" -- \ + $_VCONTEXT --migrate-self --chroot $SILENT_OPT "${OPTS_VCONTEXT_MIGRATE[@]}" -- \ + "${INITCMD_START[@]}" else ${NICE_CMD[@]} \ $_CHBIND "${CHBIND_OPTS[@]}" \ diff --git a/util-vserver/scripts/vserver.stop b/util-vserver/scripts/vserver.stop index c6e6930..8ebdf90 100644 --- a/util-vserver/scripts/vserver.stop +++ b/util-vserver/scripts/vserver.stop @@ -32,17 +32,17 @@ execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-stop cd "$VSERVER_DIR"/vdir/ if $_VSERVER_INFO - FEATURE migrate; then - ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT"} \ - $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" \ - -- "${INITCMD_STOP_SYNC[@]}" || : + ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \ + $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" -- \ + "${INITCMD_STOP[@]}" && "${INITCMD_STOP_SYNC[@]}" || : else "${NICE_CMD[@]}" \ "$_CHBIND" "${CHBIND_OPTS[@]}" \ "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT"} \ $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" \ - "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . "${INITCMD_STOP[@]}" && \ - "${INITCMD_STOP_SYNC[@]}" || : + "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" "." \ + "${INITCMD_STOP[@]}" && "${INITCMD_STOP_SYNC[@]}" || : fi sendKillSequence "$S_CONTEXT" "${INITKILL_SEQ[@]}" diff --git a/util-vserver/scripts/vserver.suexec b/util-vserver/scripts/vserver.suexec index 748f275..a45f0aa 100644 --- a/util-vserver/scripts/vserver.suexec +++ b/util-vserver/scripts/vserver.suexec @@ -29,9 +29,9 @@ cd "$VSERVER_DIR"/vdir/ if $_VSERVER_INFO - FEATURE migrate; then exec \ - ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT"} \ - $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" --uid "$user" \ - -- "$@" + ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \ + $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" --uid "$user" -- \ + "$@" else exec \ "${NICE_CMD[@]}" \ -- 1.8.1.5