[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.152,1.153

[Anton A. <ai...@de...>]

Changes by: aia21

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv25386/ntfsprogs

Modified Files:
	mkntfs.c 
Log Message:
- Do not create object id attribute on NTFS 1.2 volumes.
- Create object id attribute after volume flags attribute.


Index: mkntfs.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- mkntfs.c	13 Dec 2006 00:11:50 -0000	1.152
+++ mkntfs.c	13 Dec 2006 09:17:14 -0000	1.153
@@ -4299,10 +4299,6 @@ static BOOL create_file_volume(MFT_RECOR
 	if (!err)
 		err = add_attr_vol_name(m, g_vol->vol_name, g_vol->vol_name ?
 				strlen(g_vol->vol_name) : 0);
-#ifdef ENABLE_UUID
-	if (!err)
-		err = add_attr_object_id(m, volume_guid);
-#endif
 	if (!err) {
 		if (fl & VOLUME_IS_DIRTY)
 			ntfs_log_quiet("Setting the volume dirty so check "
@@ -4311,6 +4307,10 @@ static BOOL create_file_volume(MFT_RECOR
 		err = add_attr_vol_info(m, fl, g_vol->major_ver,
 				g_vol->minor_ver);
 	}
+#ifdef ENABLE_UUID
+	if (!err && g_vol->major_ver >= 3)
+		err = add_attr_object_id(m, volume_guid);
+#endif
 	if (err < 0) {
 		ntfs_log_error("Couldn't create $Volume: %s\n",
 				strerror(-err));