hal/tools hal-system-storage-mount,1.7,1.8

[Kay Sievers]

Update of /cvs/hal/hal/tools
In directory gabe:/tmp/cvs-serv6100/tools

Modified Files:
	hal-system-storage-mount 
Log Message:
2006-01-04  Aaron Bockover  <aaron at aaronbock.net>

        * hald/hald_dbus.c (hald_exec_method): move uid_export to root scope
        in function to avoid corruption

        * tools/hal-system-storage-mount: remove .created-by-hal before
        removing mount directory in case where mount fails


Index: hal-system-storage-mount
===================================================================
RCS file: /cvs/hal/hal/tools/hal-system-storage-mount,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- hal-system-storage-mount	20 Dec 2005 17:09:35 -0000	1.7
+++ hal-system-storage-mount	6 Jan 2006 20:45:14 -0000	1.8
@@ -163,6 +163,7 @@
 	    echo "Failed to mount device." >&2
     esac
     if [ -n "$MOUNTPOINT_CREATED" ]; then
+	rm -f "$MOUNT_ROOT/$MOUNTPOINT/.created-by-hal"
 	rmdir "$MOUNT_ROOT/$MOUNTPOINT"
     fi
     exit 1