# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1331333441 -3600
# Node ID aaee5e61e1c73dd39760cfbb3a09b77c6a6c3141
# Parent  1520163aea2d5808b07ec98deb6a235bf67ff05c
Prevent attempts to remove the mount directory and move any original /dev
directory back into place if the /dev filesystem will not unmount.

diff -r 1520163aea2d -r aaee5e61e1c7 user-do-root
--- a/user-do-root	Fri Mar 09 23:48:29 2012 +0100
+++ b/user-do-root	Fri Mar 09 23:50:41 2012 +0100
@@ -31,9 +31,8 @@
 umount "$PACKAGEROOT/proc"
 umount "$PACKAGEROOT/sys"
 if [ "$DEV" ]; then
-        umount "$PACKAGEROOT/dev"
-        rmdir "$PACKAGEROOT/dev"
-        if [ -e "$PACKAGEROOT/dev.orig" ]; then
+        umount "$PACKAGEROOT/dev" && rmdir "$PACKAGEROOT/dev"
+        if [ -e "$PACKAGEROOT/dev.orig" ] && [ ! -e "$PACKAGEROOT/dev" ]; then
                 mv "$PACKAGEROOT/dev.orig" "$PACKAGEROOT/dev"
         fi
 fi