diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-02-22 08:46:16 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-02-22 08:46:16 +0800 |
| commit | c0a2034c6cd88c7c3e4bb7a8566ba833ac8226dd (patch) | |
| tree | db69b1f6ccc2f0fcaeedc46e92afa317fe801d4c /sysutils/hal | |
| parent | 7c7a86b5e2a0c60c2458ab9bea8edf6115df10a0 (diff) | |
| download | marcuscom-ports-c0a2034c6cd88c7c3e4bb7a8566ba833ac8226dd.tar marcuscom-ports-c0a2034c6cd88c7c3e4bb7a8566ba833ac8226dd.tar.gz marcuscom-ports-c0a2034c6cd88c7c3e4bb7a8566ba833ac8226dd.tar.bz2 marcuscom-ports-c0a2034c6cd88c7c3e4bb7a8566ba833ac8226dd.tar.lz marcuscom-ports-c0a2034c6cd88c7c3e4bb7a8566ba833ac8226dd.tar.xz marcuscom-ports-c0a2034c6cd88c7c3e4bb7a8566ba833ac8226dd.tar.zst marcuscom-ports-c0a2034c6cd88c7c3e4bb7a8566ba833ac8226dd.zip | |
Ignore ufsid partitions as well.
Reported by: Kevin Oberman <oberman@es.net>
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13664 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/hal')
| -rw-r--r-- | sysutils/hal/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/hal/files/patch-hald_hf-storage.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index 3ad4eb060..9bb4a7e84 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.77 2010/02/20 04:24:16 marcus Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.78 2010/02/21 19:50:05 marcus Exp $ # PORTNAME= hal DISTVERSION= 0.5.14 -PORTREVISION= 4 +PORTREVISION= 5 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 513e845b0..d7ce4918d 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-08-24 08:42:29.000000000 -0400 -+++ hald/freebsd/hf-storage.c 2009-12-23 14:09:05.000000000 -0500 ++++ hald/freebsd/hf-storage.c 2010-02-21 19:43:45.000000000 -0500 @@ -30,6 +30,7 @@ #include <limits.h> #include <inttypes.h> @@ -8,7 +8,7 @@ #include <sys/param.h> #include <sys/types.h> #include <sys/disklabel.h> -@@ -418,10 +419,39 @@ hf_storage_parse_conftxt (const char *co +@@ -418,10 +419,40 @@ hf_storage_parse_conftxt (const char *co continue; } @@ -18,7 +18,8 @@ + * things happen in applications like nautilus. + */ + if ((! strcmp(fields[1], "LABEL") || -+ ! strcmp(fields[1], "BSD")) && ++ ! strcmp(fields[1], "BSD") || ++ ! strcmp(fields[1], "PART")) && + ! strncmp(fields[2], "ufsid/", strlen("ufsid/"))) + { + g_strfreev(fields); @@ -48,7 +49,7 @@ geom_obj->type = -1; /* We use -1 here to denote a missing type. */ geom_obj->hash = hash; -@@ -589,11 +619,16 @@ hf_storage_devd_notify (const char *syst +@@ -589,11 +620,16 @@ hf_storage_devd_notify (const char *syst char *conftxt; GSList *new_disks; @@ -66,7 +67,7 @@ new_disks = hf_storage_parse_conftxt(conftxt); g_free(conftxt); -@@ -669,7 +704,7 @@ hf_storage_conftxt_timeout_cb (gpointer +@@ -669,7 +705,7 @@ hf_storage_conftxt_timeout_cb (gpointer if (hf_is_waiting) return TRUE; |