hal/hald/linux/volume_id volume_id.c,1.44,1.45

[David Zeuthen]

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

Modified Files:
	volume_id.c 
Log Message:
2004-10-25  David Zeuthen  <davidz at redhat.com>

	* fdi/90defaultpolicy/storage-policy.fdi: Allow fstype 'auto' for 
	optical drives instead of 'iso9660,udf'

2004-10-25  David Zeuthen  <davidz at redhat.com>

	* hald/linux/volume_id/volume_id.c (volume_id_probe): Move probe_ntfs
	to the bottom as some ext3 partition was wrongly identified as a NTFS
	partition



Index: volume_id.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/volume_id/volume_id.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- volume_id.c	25 Oct 2004 02:57:27 -0000	1.44
+++ volume_id.c	25 Oct 2004 16:32:10 -0000	1.45
@@ -2091,9 +2091,6 @@
 		rc = probe_msdos_part_table(id, off);
 		if (rc == 0)
 			break;
-		rc = probe_ntfs(id, off);
-		if (rc == 0)
-			break;
 		rc = probe_vfat(id, off);
 		if (rc == 0)
 			break;
@@ -2131,6 +2128,9 @@
 		rc = probe_ufs(id, off);
 		if (rc == 0)
 			break;
+		rc = probe_ntfs(id, off);
+		if (rc == 0)
+			break;
 
 		rc = -1;
 	}