summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tools/hal-storage-cleanup-all-mountpoints.c7
-rw-r--r--tools/hal-storage-shared.c2
2 files changed, 3 insertions, 6 deletions
diff --git a/tools/hal-storage-cleanup-all-mountpoints.c b/tools/hal-storage-cleanup-all-mountpoints.c
index aa8d6574..a997190e 100644
--- a/tools/hal-storage-cleanup-all-mountpoints.c
+++ b/tools/hal-storage-cleanup-all-mountpoints.c
@@ -162,9 +162,8 @@ do_cleanup (void)
int
main (int argc, char *argv[])
{
- if (!lock_hal_mtab ()) {
- unknown_error ("Cannot obtain lock on /media/.hal-mtab");
- }
+
+ unlink ("/media/.hal-mtab-lock");
if (getenv ("HAL_PROP_INFO_UDI") == NULL)
usage ();
@@ -174,7 +173,5 @@ main (int argc, char *argv[])
#endif
do_cleanup ();
-
- unlock_hal_mtab ();
return 0;
}
diff --git a/tools/hal-storage-shared.c b/tools/hal-storage-shared.c
index 15ce3b5e..ce582c25 100644
--- a/tools/hal-storage-shared.c
+++ b/tools/hal-storage-shared.c
@@ -560,7 +560,7 @@ lock_hal_mtab (void)
printf ("%d: XYA attempting to get lock on /media/.hal-mtab-lock\n", getpid ());
- lock_mtab_fd = open ("/media/.hal-mtab-lock", O_CREAT | O_RDWR);
+ lock_mtab_fd = open ("/media/.hal-mtab-lock", O_CREAT | O_RDWR, 0600);
if (lock_mtab_fd < 0)
return FALSE;