summaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-08-19 12:40:26 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-08-19 12:40:26 +0800
commit70f45e48b74d654a332edb491a31aba0186e6a7f (patch)
treee9f7a5eaef3bb51b764c5cc17704e8c7e7c7f7b3 /sysutils
parent5ac56bc6f5f3b25d50578bacd3c51b76d6fe9be3 (diff)
downloadmarcuscom-ports-70f45e48b74d654a332edb491a31aba0186e6a7f.tar
marcuscom-ports-70f45e48b74d654a332edb491a31aba0186e6a7f.tar.gz
marcuscom-ports-70f45e48b74d654a332edb491a31aba0186e6a7f.tar.bz2
marcuscom-ports-70f45e48b74d654a332edb491a31aba0186e6a7f.tar.lz
marcuscom-ports-70f45e48b74d654a332edb491a31aba0186e6a7f.tar.xz
marcuscom-ports-70f45e48b74d654a332edb491a31aba0186e6a7f.tar.zst
marcuscom-ports-70f45e48b74d654a332edb491a31aba0186e6a7f.zip
Skip "probeX" devices when scanning for new SCSI disks.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12663 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/hal/Makefile4
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-scsi.c11
2 files changed, 13 insertions, 2 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 0bc7b5a19..fb308eefd 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.59 2009/07/19 01:59:32 marcus Exp $
+# $MCom: ports/sysutils/hal/Makefile,v 1.60 2009/08/08 20:02:21 marcus Exp $
#
PORTNAME= hal
DISTVERSION= 0.5.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
new file mode 100644
index 000000000..bc7ad871d
--- /dev/null
+++ b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
@@ -0,0 +1,11 @@
+--- hald/freebsd/hf-scsi.c.orig 2009-08-18 16:19:02.000000000 -0400
++++ hald/freebsd/hf-scsi.c 2009-08-18 16:19:24.000000000 -0400
+@@ -549,7 +549,7 @@ hf_scsi_probe (void)
+ break; /* only use the first peripheral */
+
+ match = &ccb.cdm.matches[i].result.periph_result;
+- if ((int) match->path_id == -1 || ! strcmp(match->periph_name, "pass"))
++ if ((int) match->path_id == -1 || ! strcmp(match->periph_name, "pass") || ! strcmp(match->periph_name, "probe"))
+ break;
+
+ pending_devname = g_strdup_printf("%s%i", match->periph_name, match->unit_number);