hal/hald/linux2/probing probe-storage.c,1.4,1.5

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux2/probing
In directory gabe:/tmp/cvs-serv31743/hald/linux2/probing

Modified Files:
	probe-storage.c 
Log Message:
2005-03-22  David Zeuthen  <davidz at redhat.com>

	* hald/linux2/probing/probe-storage.c (main): Add some extra debugging
	to help me with RH bug #151762

	* hald/linux2/physdev.c: Set <bustype>.linux.driver for all bus devices

	* hald/linux2/classdev.c (net_add): Don't set net.linux.driver, first
	of all because it doesn't make sense (drivers don't bind to class
	devices, they bind to physical devices), second because the Linux
	kernel moved around where the driver symlink is.



Index: probe-storage.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-storage.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- probe-storage.c	28 Feb 2005 19:43:29 -0000	1.4
+++ probe-storage.c	22 Mar 2005 18:43:18 -0000	1.5
@@ -147,8 +147,8 @@
 	if (!libhal_ctx_init (ctx, &error))
 		goto out;
 
-	dbg ("Doing probe-storage for %s (bus %s) (drive_type %s) (--only-check-for-fs==%d)", 
-	     device_file, bus, drive_type, only_check_for_fs);
+	dbg ("Doing probe-storage for %s (bus %s) (drive_type %s) (udi=%s) (--only-check-for-fs==%d)", 
+	     device_file, bus, drive_type, udi, only_check_for_fs);
 
 	if (!only_check_for_fs) {
 		/* Only do drive_id on IDE and real SCSI disks - specifically
@@ -171,6 +171,7 @@
 
 			did = drive_id_open_fd (fd);
 			if (drive_id_probe_all (did) == 0) {
+				dbg ("serial = '%s', firmware = '%s'", did->serial, did->firmware);
 				if (did->serial[0] != '\0')
 					if (!libhal_device_set_property_string (ctx, udi, "storage.serial", 
 										did->serial, &error)) {