hal: Branch 'master'

[Joe Marcus Clarke]

 hald/freebsd/hf-scsi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c31d30640707aa63928aa20e067da8b19405e663
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date:   Wed Aug 19 16:23:12 2009 -0400

    ignore probe devices
    
    Ignore probeX devices when scanning for new SCSI disks.

diff --git a/hald/freebsd/hf-scsi.c b/hald/freebsd/hf-scsi.c
index 7ab753c..527bc51 100644
--- a/hald/freebsd/hf-scsi.c
+++ b/hald/freebsd/hf-scsi.c
@@ -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);