X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.start;h=96d3a16ab8c249cb3c5f6bdb186975410d1f828d;hb=5ff988c3c71b5554a040df85c98adb80f3d2fadd;hp=ca0b0af54910d859884c7859c257514ee5ada7e1;hpb=221c549c20a359fa3dc39614357137e174968d03;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index ca0b0af..96d3a16 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -20,6 +20,7 @@ if isVserverRunning "$VSERVER_DIR"; then exit 1 fi +set -e generateOptions "$VSERVER_DIR" execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" prepre-start enableInterfaces "$VSERVER_DIR" @@ -27,14 +28,15 @@ enableInterfaces "$VSERVER_DIR" mountVserver "$VSERVER_DIR" prepareInit "$VSERVER_DIR" -cd "$VSERVER_DIR"/vdir/ +cd "$VSERVER_DIR"/vdir/ execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-start +cd "$VSERVER_DIR"/vdir/ "${NICE_CMD[@]}" \ "$_CHBIND" "${CHBIND_OPTS[@]}" \ "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ - "$_CHCONTEXT" "${CHCONTEXT_DISCONNECT[@]}" "${CHCONTEXT_OPTS[@]}" \ + "$_CHCONTEXT" "${CHCONTEXT_OPTS[@]}" "${CHCONTEXT_INIT_OPTS[@]}" \ "$_SAVE_CTXINFO" "$VSERVER_DIR" \ "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . "${INITCMD_START[@]}"