|
Lines 1-5
Link Here
|
| 1 |
--- hald/freebsd/hf-storage.c.orig 2009-08-24 08:42:29.000000000 -0400 |
1 |
--- ./hald/freebsd/hf-storage.c.orig 2009-08-24 14:42:29.000000000 +0200 |
| 2 |
+++ hald/freebsd/hf-storage.c 2011-07-20 20:52:51.000000000 -0400 |
2 |
+++ ./hald/freebsd/hf-storage.c 2013-06-10 16:22:36.080280935 +0200 |
| 3 |
@@ -30,6 +30,7 @@ |
3 |
@@ -30,6 +30,7 @@ |
| 4 |
#include <limits.h> |
4 |
#include <limits.h> |
| 5 |
#include <inttypes.h> |
5 |
#include <inttypes.h> |
|
Lines 8-14
Link Here
|
| 8 |
#include <sys/param.h> |
8 |
#include <sys/param.h> |
| 9 |
#include <sys/types.h> |
9 |
#include <sys/types.h> |
| 10 |
#include <sys/disklabel.h> |
10 |
#include <sys/disklabel.h> |
| 11 |
@@ -418,10 +419,41 @@ hf_storage_parse_conftxt (const char *co |
11 |
@@ -174,6 +175,10 @@ hf_storage_device_probe_geom (HalDevice |
|
|
12 |
if (! geom_obj) |
| 13 |
return; |
| 14 |
|
| 15 |
+ /* Exclude /dev/diskid/ labels as they are duplicates. */ |
| 16 |
+ if (strncmp(geom_obj->dev, "diskid/", 7) == 0) |
| 17 |
+ return; |
| 18 |
+ |
| 19 |
node = g_node_find(hf_storage_geom_tree, G_PRE_ORDER, G_TRAVERSE_ALL, |
| 20 |
GUINT_TO_POINTER(geom_obj->hash)); |
| 21 |
|
| 22 |
@@ -418,10 +423,41 @@ hf_storage_parse_conftxt (const char *co |
| 12 |
continue; |
23 |
continue; |
| 13 |
} |
24 |
} |
| 14 |
|
25 |
|
|
Lines 50-56
Link Here
|
| 50 |
geom_obj->type = -1; /* We use -1 here to denote a missing type. */ |
61 |
geom_obj->type = -1; /* We use -1 here to denote a missing type. */ |
| 51 |
geom_obj->hash = hash; |
62 |
geom_obj->hash = hash; |
| 52 |
|
63 |
|
| 53 |
@@ -458,6 +490,13 @@ hf_storage_parse_conftxt (const char *co |
64 |
@@ -458,6 +494,13 @@ hf_storage_parse_conftxt (const char *co |
| 54 |
{ |
65 |
{ |
| 55 |
g_free(geom_obj->class); |
66 |
g_free(geom_obj->class); |
| 56 |
geom_obj->class = g_strdup(fields[12]); |
67 |
geom_obj->class = g_strdup(fields[12]); |
|
Lines 64-70
Link Here
|
| 64 |
} |
75 |
} |
| 65 |
} |
76 |
} |
| 66 |
} |
77 |
} |
| 67 |
@@ -589,11 +628,18 @@ hf_storage_devd_notify (const char *syst |
78 |
@@ -589,11 +632,18 @@ hf_storage_devd_notify (const char *syst |
| 68 |
char *conftxt; |
79 |
char *conftxt; |
| 69 |
GSList *new_disks; |
80 |
GSList *new_disks; |
| 70 |
|
81 |
|
|
Lines 84-90
Link Here
|
| 84 |
new_disks = hf_storage_parse_conftxt(conftxt); |
95 |
new_disks = hf_storage_parse_conftxt(conftxt); |
| 85 |
g_free(conftxt); |
96 |
g_free(conftxt); |
| 86 |
|
97 |
|
| 87 |
@@ -669,7 +715,7 @@ hf_storage_conftxt_timeout_cb (gpointer |
98 |
@@ -669,7 +719,7 @@ hf_storage_conftxt_timeout_cb (gpointer |
| 88 |
if (hf_is_waiting) |
99 |
if (hf_is_waiting) |
| 89 |
return TRUE; |
100 |
return TRUE; |