Index: trunk/ChameleonPrefPane/Sources/BootSetupController.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/BootSetupController.mm	(revision 345)
+++ trunk/ChameleonPrefPane/Sources/BootSetupController.mm	(revision 346)
@@ -97,16 +97,21 @@
 			{
 				switch (k) {
 					case 0: // disk number
-						diskNum = [word characterAtIndex:0] - '0' ;
+						diskNum = [word intValue] ;
+						[ p setDiskNumber:diskNum];
 						break;
 					case 1: // partition number
-						partNum = [word characterAtIndex:0] - '0' ;
+						partNum = [word intValue] ;
+						[ p setPartitionNumber: partNum];							
 						break;
 					case 2: // volume label
 						[p setVName: word];
 					case 3: // fstype
 						[p setVKind: word];
 						break;
+					case 4: // vUUID
+						[p setVUUID: word];
+						break;
 					default:
 						break;
 				}
@@ -203,7 +208,8 @@
 					 [p diskNumber], cPartDescSep,
 					 [p partitionNumber], cPartDescSep,
 					 [[p vName] UTF8String], cPartDescSep,
-					 [[p vKind] UTF8String]);
+					 [[p vKind] UTF8String], cPartDescSep, 
+					 [[p vUUID] UTF8String]);
 			
 			// write it to the dictionary
 			NSString * key  = [[NSString alloc] initWithUTF8String: keyPartN];
Index: trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm	(revision 345)
+++ trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm	(revision 346)
@@ -25,7 +25,7 @@
 	char line[256];
 	ShellProcess p;
 	
-	p.open("ls -1 /dev/disk*s*");
+	p.open("ls -1 /dev/disk*");
 	while( p.get_line(line, sizeof(line)-1))
 	{
 		size_t l = strlen(line);
Index: trunk/ChameleonPrefPane/CHANGES
===================================================================
--- trunk/ChameleonPrefPane/CHANGES	(revision 345)
+++ trunk/ChameleonPrefPane/CHANGES	(revision 346)
@@ -1,3 +1,5 @@
+- Added Partition UUID (OS X standard uuid, so chamelon ntfs/fat partition uuid's are for now not compatible).
+- Added new Partition Extractor engine, complety rewritten in objective c.
 - Added About Dialog, made the displayed version numbers all rely on the info.plist file
 - Fixed refresh and on checked associated button state, made sure the string is disabled if value is 0
 - Fixed crash when using swap hd 0<->2