hal/tools Makefile.am, 1.30, 1.31 hal-system-storage-cleanup-mountpoint, NONE, 1.1

[David Zeuthen]

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

Modified Files:
	Makefile.am 
Added Files:
	hal-system-storage-cleanup-mountpoint 
Log Message:
2006-02-12  David Zeuthen  <davidz at redhat.com>

        * tools/Makefile.am (script_SCRIPTS): Add
        tools/hal-system-storage-cleanup-mountpoint

        * tools/hal-system-storage-cleanup-mountpoint: New file

        * hald/linux2/blockdev.c (blockdev_refresh_mount_state)
        (cleanup_mountpoint_cb): Clean up mount point if we can see it was
        created by hal



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/tools/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Makefile.am	29 Jan 2006 15:51:39 -0000	1.30
+++ Makefile.am	12 Feb 2006 22:38:45 -0000	1.31
@@ -53,6 +53,7 @@
 	hal-system-storage-mount		\
 	hal-system-storage-unmount		\
 	hal-system-storage-eject		\
+	hal-system-storage-cleanup-mountpoint   \
 	hal-system-storage-cleanup-mountpoints
 
 EXTRA_DIST=$(man_MANS) $(MAN_IN_FILES) gen-libgphoto-hal-fdi $(script_SCRIPTS)

--- NEW FILE: hal-system-storage-cleanup-mountpoint ---
#!/bin/sh

# Copyright (C) 2006, David Zeuthen <davidz at redhat.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2.

if [ "$HALD_CLEANUP" = "" ]; then
    echo Specify directory to clean up with the environment variable HALD_CLEANUP
    exit 1
fi

# check if we created it
if [ ! -e "$HALD_CLEANUP/.created-by-hal" ]; then
    exit 1
fi

rm -f "$HALD_CLEANUP/.created-by-hal"
rmdir --ignore-fail-on-non-empty "$HALD_CLEANUP"