From 411879c63d097fb81bb0b1285fe9d57aef1a8567 Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Tue, 22 Sep 2009 05:59:43 +0000
Subject: The extra sleep before checking kern.geom.conftxt was causing volumes
not to auto-mount by default in nautilus. It didn't really fix anything
anyway, so ge trid of it.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12954 df743ca5-7f9a-e211-a948-0013205c9059
---
sysutils/hal/Makefile | 4 ++--
sysutils/hal/files/patch-hald_hf-storage.c | 22 ++++++++++------------
2 files changed, 12 insertions(+), 14 deletions(-)
(limited to 'sysutils')
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 5a55e8041..42d269608 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/hal/Makefile,v 1.64 2009/09/18 05:47:01 marcus Exp $
+# $MCom: ports/sysutils/hal/Makefile,v 1.65 2009/09/19 06:09:44 marcus Exp $
#
PORTNAME= hal
DISTVERSION= 0.5.13
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/
diff --git a/sysutils/hal/files/patch-hald_hf-storage.c b/sysutils/hal/files/patch-hald_hf-storage.c
index 40cccef79..17570163d 100644
--- a/sysutils/hal/files/patch-hald_hf-storage.c
+++ b/sysutils/hal/files/patch-hald_hf-storage.c
@@ -1,5 +1,5 @@
--- hald/freebsd/hf-storage.c.orig 2009-05-12 08:24:28.000000000 -0400
-+++ hald/freebsd/hf-storage.c 2009-09-13 20:48:38.000000000 -0400
++++ hald/freebsd/hf-storage.c 2009-09-22 01:53:29.000000000 -0400
@@ -30,6 +30,8 @@
#include <limits.h>
#include <inttypes.h>
@@ -114,7 +114,7 @@
else
geom_obj->type = atoi(fields[10]);
}
-@@ -541,15 +579,22 @@ hf_storage_device_rescan_real (HalDevice
+@@ -541,15 +579,20 @@ hf_storage_device_rescan_real (HalDevice
}
static gboolean
@@ -135,12 +135,10 @@
+ if (! data || strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") ||
+ (strcmp(type, "CREATE") && strcmp(type, "DESTROY")))
+ return FALSE;
-+
-+ sleep(1);
conftxt = hf_get_string_sysctl(NULL, "kern.geom.conftxt");
new_disks = hf_storage_parse_conftxt(conftxt);
-@@ -572,6 +617,7 @@ hf_storage_conftxt_timeout_cb (gpointer
+@@ -572,6 +615,7 @@ hf_storage_conftxt_timeout_cb (gpointer
if (! hf_storage_find_disk(disks, disk->name))
{
osspec_probe(); /* catch new disk(s) */
@@ -148,7 +146,7 @@
break;
}
}
-@@ -593,7 +639,10 @@ hf_storage_conftxt_timeout_cb (gpointer
+@@ -593,7 +637,10 @@ hf_storage_conftxt_timeout_cb (gpointer
device = hf_devtree_find_from_name(hald_get_gdl(), disk->name);
if (device && hal_device_has_capability(device, "storage") &&
! hf_storage_device_has_addon(device))
@@ -160,7 +158,7 @@
}
}
else
-@@ -601,7 +650,10 @@ hf_storage_conftxt_timeout_cb (gpointer
+@@ -601,7 +648,10 @@ hf_storage_conftxt_timeout_cb (gpointer
/* disk removed */
device = hf_devtree_find_from_name(hald_get_gdl(), disk->name);
if (device && hal_device_has_capability(device, "storage"))
@@ -172,7 +170,7 @@
}
}
}
-@@ -610,17 +662,30 @@ hf_storage_conftxt_timeout_cb (gpointer
+@@ -610,17 +660,30 @@ hf_storage_conftxt_timeout_cb (gpointer
g_slist_free(disks);
disks = new_disks;
@@ -205,7 +203,7 @@
return;
conftxt = hf_get_string_sysctl(NULL, "kern.geom.conftxt");
-@@ -636,8 +701,10 @@ hf_storage_init_geom (void)
+@@ -636,8 +699,10 @@ hf_storage_init_geom (void)
static void
hf_storage_init (void)
{
@@ -217,7 +215,7 @@
}
void
-@@ -719,8 +786,6 @@ hf_storage_device_add (HalDevice *device
+@@ -719,8 +784,6 @@ hf_storage_device_add (HalDevice *device
{
g_return_if_fail(HAL_IS_DEVICE(device));
@@ -226,7 +224,7 @@
if (hf_device_preprobe(device))
{
hf_storage_device_probe(device, FALSE);
-@@ -738,7 +803,7 @@ hf_storage_get_geoms (const char *devnam
+@@ -738,7 +801,7 @@ hf_storage_get_geoms (const char *devnam
g_return_val_if_fail(devname != NULL, NULL);
@@ -235,7 +233,7 @@
hash = g_str_hash(devname);
node = g_node_find(hf_storage_geom_tree, G_PRE_ORDER, G_TRAVERSE_ALL,
-@@ -801,3 +866,7 @@ HFHandler hf_storage_handler = {
+@@ -801,3 +864,7 @@ HFHandler hf_storage_handler = {
.probe = hf_storage_probe,
.device_rescan = hf_storage_device_rescan
};
--
cgit v1.2.3