X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.stop;h=55aedb3d502a91c2795b2096334743eeef83d924;hb=HEAD;hp=07e189fd8047962bbb1f1cf1042b0e4c13429d84;hpb=6c03c74dde26b0a0b3a17108b083a862b16fb0de;p=util-vserver.git diff --git a/scripts/vserver.stop b/scripts/vserver.stop index 07e189f..55aedb3 100644 --- a/scripts/vserver.stop +++ b/scripts/vserver.stop @@ -80,15 +80,17 @@ if test -n "$_IS_FAKEINIT" && \ $_VKILL -s INT --xid "$S_CONTEXT" -- 1 || fail=1 fi elif $_VSERVER_INFO - FEATURE migrate; then + "${IONICE_CMD[@]}" \ "${NICE_CMD[@]}" \ "${CHBIND_CMD[@]}" \ - "$_VSPACE" --enter "$S_CONTEXT" "${OPTS_VSPACE[@]}" -- \ + "$_VSPACE" --enter "$S_CONTEXT" "${OPTS_VSPACE[@]}" "${OPTS_VSPACE_SHARED[@]}" -- \ "$_VTAG" --migrate "${OPTS_VTAG_ENTER[@]}" --silent -- \ - $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" -- \ + $_VCONTEXT $SILENT_OPT --migrate $OPT_VCONTEXT_CHROOT --xid "$S_CONTEXT" -- \ "${INITCMD_STOP[@]}" || fail=1 else + "${IONICE_CMD[@]}" \ "${NICE_CMD[@]}" \ - "$_CHBIND" "${CHBIND_OPTS[@]}" \ + "${CHBIND_CMD[@]}" \ "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" \ "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" "." \ @@ -124,3 +126,4 @@ saveDiskLimits "$VSERVER_DIR" execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" postpost-stop removeCPUSET "$VSERVER_DIR" +destroyCgroup "$VSERVER_DIR"