hal: Branch 'master'

[Joe Marcus Clarke]

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

New commits:
commit b3063505d639a9dd64dadd786fd69cfe00e83370
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date:   Wed Mar 19 02:02:45 2008 -0400

    make sure the block device is added before probing it
    
    Do not add the block device after probing it as a new volume could be added
    to the GDL before its parent block device.  This can screw up auto-mounting.

diff --git a/hald/freebsd/hf-scsi.c b/hald/freebsd/hf-scsi.c
index 8c865c9..7ab753c 100644
--- a/hald/freebsd/hf-scsi.c
+++ b/hald/freebsd/hf-scsi.c
@@ -409,8 +409,8 @@ hf_scsi_handle_pending_device (struct device_match_result **match,
 		   */
 		  hf_block_device_complete(block_device, block_device, FALSE);
 
-		  hf_storage_device_probe(block_device, FALSE);
 		  hf_device_add(block_device);
+		  hf_storage_device_probe(block_device, FALSE);
 		}
 	    }
 	}