hal/hald/linux/volume_id volume_id.c,1.41,1.42

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux/volume_id
In directory gabe:/tmp/cvs-serv18777/hald/linux/volume_id

Modified Files:
	volume_id.c 
Log Message:
2004-09-29  David Zeuthen  <david at fubar.dk>

	* hald/linux/volume_id/volume_id.c (volume_id_probe): Probe for msdos
	partition table before any other fs'es with the signature in the first
	block. Patch from Martin Pitt <martin at piware.de>.



Index: volume_id.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/volume_id/volume_id.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- volume_id.c	26 Sep 2004 22:04:45 -0000	1.41
+++ volume_id.c	29 Sep 2004 16:29:45 -0000	1.42
@@ -2052,13 +2052,13 @@
 			break;
 
 		/* signature in the first block, only small buffer needed */
-		rc = probe_ntfs(id, off);
+		rc = probe_msdos_part_table(id, off);
 		if (rc == 0)
 			break;
-		rc = probe_vfat(id, off);
+		rc = probe_ntfs(id, off);
 		if (rc == 0)
 			break;
-		rc = probe_msdos_part_table(id, off);
+		rc = probe_vfat(id, off);
 		if (rc == 0)
 			break;
 		rc = probe_mac_partition_map(id, off);