X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.start;h=6658acb449bc6c8c59b497f9d507c92b1372e70c;hb=ab4b2dd361f2086da8ec0ae99ef4bf79dd7265d9;hp=569c87e27caaa116a6c12c60e6d483fece783097;hpb=36171922c7107ef4fb2ed9101d0dca58a43b5615;p=util-vserver.git diff --git a/scripts/vserver.start b/scripts/vserver.start index 569c87e..6658acb 100644 --- a/scripts/vserver.start +++ b/scripts/vserver.start @@ -121,6 +121,7 @@ enableInterfaces "$VSERVER_DIR" && have_interfaces=1 mountVserver "$VSERVER_DIR" && is_mounted=1 prepareInit "$VSERVER_DIR" addtoCPUSET "$VSERVER_DIR" +attachToCgroup "$VSERVER_DIR" handleDeviceMap --set "$S_CONTEXT" "$VSERVER_DIR/apps/vdevmap" @@ -143,7 +144,7 @@ if $_VSERVER_INFO - FEATURE migrate; then ${OPTION_STRACE:+$_STRACE -fF -o /tmp/vserver-start.$$} \ ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ $_VSPACE --set "${OPTS_VSPACE[@]}" -- \ - $_EXEC_REMOUNT -- \ + $_EXEC_REMOUNT /proc /sys -- \ $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \ $_VSCHED --xid self --force "${OPTS_VSCHED[@]}" -- \ $_VSYSCTL --xid self --dir "$VSERVER_DIR"/sysctl --missingok -- \ @@ -154,7 +155,7 @@ if $_VSERVER_INFO - FEATURE migrate; then $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" -- \ $_SAVE_CTXINFO "$VSERVER_DIR" \ $_ENV -i "${OPTS_ENV[@]}" \ - $_VCONTEXT --migrate-self --endsetup --chroot $SILENT_OPT \ + $_VCONTEXT --migrate-self --endsetup $OPT_VCONTEXT_CHROOT $SILENT_OPT \ "${OPTS_VCONTEXT_MIGRATE[@]}" "${OPTS_VCONTEXT_ENTER[@]}" -- \ "${INITCMD_START[@]}" else