From 03ec4e70b822664dc905ed1295680c1644564734 Mon Sep 17 00:00:00 2001 From: marcus Date: Mon, 27 Oct 2008 17:26:32 +0000 Subject: Pass the volume UDI when unmounting volumes before an eject operation. Reported by: Kris Moore of PC-BSD git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11740 df743ca5-7f9a-e211-a948-0013205c9059 --- sysutils/hal/Makefile | 4 ++-- sysutils/hal/files/patch-tools_hal-storage-eject.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 sysutils/hal/files/patch-tools_hal-storage-eject.c diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index 21f143d5a..6c1243d92 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/sysutils/hal/Makefile,v 1.50 2008/10/26 19:42:57 marcus Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.51 2008/10/26 20:37:46 marcus Exp $ # PORTNAME= hal DISTVERSION= 0.5.11 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ diff --git a/sysutils/hal/files/patch-tools_hal-storage-eject.c b/sysutils/hal/files/patch-tools_hal-storage-eject.c new file mode 100644 index 000000000..730e2a076 --- /dev/null +++ b/sysutils/hal/files/patch-tools_hal-storage-eject.c @@ -0,0 +1,11 @@ +--- tools/hal-storage-eject.c.orig 2008-10-27 13:23:11.000000000 -0400 ++++ tools/hal-storage-eject.c 2008-10-27 13:23:23.000000000 -0400 +@@ -190,7 +190,7 @@ main (int argc, char *argv[]) + unknown_eject_error ("Cannot obtain lock on /media/.hal-mtab"); + } + handle_unmount (hal_ctx, +- udi, volume_to_unmount, drive, ++ volume_udi, volume_to_unmount, drive, + libhal_volume_get_device_file (volume_to_unmount), + invoked_by_uid, invoked_by_syscon_name, + FALSE, FALSE); /* use neither lazy nor force */ -- cgit v1.2.3