--- vserver.stop.orig	2010-06-05 11:55:50.000000000 -0500
+++ vserver.stop	2010-09-20 02:23:54.000000000 -0500
@@ -68,6 +68,8 @@ cd "$VSERVER_DIR"/vdir/
 execScriptlets     "$VSERVER_DIR" "$VSERVER_NAME" pre-stop
 cd "$VSERVER_DIR"/vdir/
 
+handleDeviceMap --unset "$S_CONTEXT" "$VSERVER_DIR/apps/vdevmap"
+
 test -z "$OPTION_DEFAULTTTY" || setDefaultTTY "$VSERVER_DIR"
 
 $_VATTRIBUTE --set --xid "$S_CONTEXT" --flag !SC_HELPER
@@ -117,8 +119,6 @@ sendKillSequence   "$S_CONTEXT" "${INITK
 
 execScriptlets    "$VSERVER_DIR" "$VSERVER_NAME" post-stop
 
-handleDeviceMap --unset "$S_CONTEXT" "$VSERVER_DIR/apps/vdevmap"
-
 umountVserver     "$VSERVER_DIR" || :
 disableInterfaces "$VSERVER_DIR"