# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1347229862 -7200
# Node ID 8f2aa868983fe6812c54c690acaee6068c33f90f
# Parent  b6d822c0302f1bcdf9f3eb7b4b545fa1dd1fbb66
Added marker files indicating usage of mounted devices so that such devices are
not then unmounted by terminating processes that have been sharing the same
system.
Fixed the help message output.

diff -r b6d822c0302f -r 8f2aa868983f user-do-root
--- a/user-do-root	Mon May 07 00:32:42 2012 +0200
+++ b/user-do-root	Mon Sep 10 00:31:02 2012 +0200
@@ -33,8 +33,13 @@
         else
                 echo "Devices may already be defined for the installation." 1>&2
         fi
+
+        # Record this process's usage of the devices.
+
+        touch "$PACKAGEROOT/dev.userinstall.$$"
+
 elif [ ! -e "$PACKAGEROOT/dev" ]; then
-        echo 1>&2 <<EOF
+        cat 1>&2 <<EOF
 Devices are not defined for the installation.
 To mount the host system's devices, use the --dev option.
 EOF
@@ -50,9 +55,20 @@
 umount "$PACKAGEROOT/proc"
 umount "$PACKAGEROOT/sys"
 
-if [ "$DEV" ]; then
-        umount "$PACKAGEROOT/dev" && rmdir "$PACKAGEROOT/dev"
-        if [ -e "$PACKAGEROOT/dev.orig" ] && [ ! -e "$PACKAGEROOT/dev" ]; then
-                mv "$PACKAGEROOT/dev.orig" "$PACKAGEROOT/dev"
-        fi
+rm "$PACKAGEROOT/dev.userinstall.$$" 
+
+if [ "$DEV" ] ; then
+        for FILENAME in "$PACKAGEROOT/dev.userinstall."* ; do
+
+                # If the pattern does not expand to produce filenames, no such
+                # files are present.
+
+                if [ "$FILENAME" = "$PACKAGEROOT/dev.userinstall.*" ]; then
+                        umount "$PACKAGEROOT/dev" && rmdir "$PACKAGEROOT/dev"
+                        if [ -e "$PACKAGEROOT/dev.orig" ] && [ ! -e "$PACKAGEROOT/dev" ]; then
+                                mv "$PACKAGEROOT/dev.orig" "$PACKAGEROOT/dev"
+                        fi
+                fi
+                break
+        done
 fi