diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-02-26 21:31:54 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-02-26 21:31:54 +0800 |
| commit | 1eb290debb1807fb63184cc7d7da5f931a40f8a0 (patch) | |
| tree | 72c6d7adee16d71840d0969a6c7b6aed24714722 /sysutils | |
| parent | 381157a2168b2773792eab08ba15744126f368fb (diff) | |
| download | marcuscom-ports-1eb290debb1807fb63184cc7d7da5f931a40f8a0.tar marcuscom-ports-1eb290debb1807fb63184cc7d7da5f931a40f8a0.tar.gz marcuscom-ports-1eb290debb1807fb63184cc7d7da5f931a40f8a0.tar.bz2 marcuscom-ports-1eb290debb1807fb63184cc7d7da5f931a40f8a0.tar.lz marcuscom-ports-1eb290debb1807fb63184cc7d7da5f931a40f8a0.tar.xz marcuscom-ports-1eb290debb1807fb63184cc7d7da5f931a40f8a0.tar.zst marcuscom-ports-1eb290debb1807fb63184cc7d7da5f931a40f8a0.zip | |
Do not handle ufs labels in addition to ufsid labels.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13730 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
| -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 9bb4a7e84..c37c7c690 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.78 2010/02/21 19:50:05 marcus Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.79 2010/02/22 00:46:16 marcus Exp $ # PORTNAME= hal DISTVERSION= 0.5.14 -PORTREVISION= 5 +PORTREVISION= 6 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 d7ce4918d..162079ac7 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 2010-02-21 19:43:45.000000000 -0500 ++++ hald/freebsd/hf-storage.c 2010-02-26 08:29:38.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,40 @@ hf_storage_parse_conftxt (const char *co +@@ -418,10 +419,41 @@ hf_storage_parse_conftxt (const char *co continue; } @@ -20,7 +20,8 @@ + if ((! strcmp(fields[1], "LABEL") || + ! strcmp(fields[1], "BSD") || + ! strcmp(fields[1], "PART")) && -+ ! strncmp(fields[2], "ufsid/", strlen("ufsid/"))) ++ ! (strncmp(fields[2], "ufsid/", strlen("ufsid/")) || ++ ! strncmp(fields[2], "ufs/", strlen("ufs/")))) + { + g_strfreev(fields); + continue; @@ -49,7 +50,7 @@ geom_obj->type = -1; /* We use -1 here to denote a missing type. */ geom_obj->hash = hash; -@@ -589,11 +620,16 @@ hf_storage_devd_notify (const char *syst +@@ -589,11 +621,16 @@ hf_storage_devd_notify (const char *syst char *conftxt; GSList *new_disks; @@ -67,7 +68,7 @@ new_disks = hf_storage_parse_conftxt(conftxt); g_free(conftxt); -@@ -669,7 +705,7 @@ hf_storage_conftxt_timeout_cb (gpointer +@@ -669,7 +706,7 @@ hf_storage_conftxt_timeout_cb (gpointer if (hf_is_waiting) return TRUE; |