Index: trunk/ChameleonPrefPane/Sources/ShellProcess.cpp
===================================================================
--- trunk/ChameleonPrefPane/Sources/ShellProcess.cpp	(revision 58)
+++ trunk/ChameleonPrefPane/Sources/ShellProcess.cpp	(revision 59)
@@ -85,6 +85,10 @@
 	return szAlias;
 	
 }
+
+// uncomment the following line for debug
+#define DEBUG_DISKUTIL 0
+
 //----------------------------------------------------------------
 const std::vector<PartitionInfo>& 
 PartitionExtractor::extractPartitions(const char* szHide, const char* szRenamed)
@@ -106,7 +110,12 @@
 	_partList.clear();
 	if (szHide) hidePartitions(szHide);
 	if (szRenamed) renamedPartitions(szRenamed);
+
+#if DEBUG_DISKUTIL
+	this->open("cat /diskutil.txt");
+#else
 	this->open("diskutil list");
+#endif
 	
 	while(get_line(line, sizeof(line)-1))
 	{
@@ -121,7 +130,7 @@
 		if (sdisk)
 		{
 			// extract disk number
-			disk= sdisk[strlen(diskTag)]-'0';
+			sscanf(&sdisk[strlen(diskTag)],"%d", &disk);
 			if (disk>=0 && disk <MAX_HD)
 				disk = _hdRedirTable[disk];
 		}
@@ -151,17 +160,22 @@
 				partInfo.fsType()!="Apple_Free" 
 				)
 			{
-				std::string DiskLabel(label), UnixPath, WinPath; 
-				DiskLabel.erase( DiskLabel.find_last_not_of(" ") + 1);
+				std::string diskLabel(trim(label)); 
 				bool found=false;
 				
-				// early bail out if we found what we need:
-				if (fileExists((UnixPath = "/Volumes/" + DiskLabel + "/usr/bin/man"))) 
+				// early bail out if we found what we need: DON't make any assumption 
+				// that Windows is the name of WIN32 bootable disk dir ...
+				if (
+					fileExists("/Volumes/" + diskLabel + "/boot") || 
+					fileExists("/Volumes/" + diskLabel + "/System/Library/Extensions") ||
+					fileExists("/Volumes/" + diskLabel + "/ntldr") ||
+					fileExists("/Volumes/" + diskLabel + "/bootmgr") ||
+					fileExists("/Volumes/" + diskLabel + "/Boot") ||
+					fileExists("/Volumes/" + diskLabel + "/pagefile.sys") ||
+					fileExists("/Volumes/" + diskLabel + "/hiberfil.sys")
+					)
 					found=true;
-				else if ((strstr(label,"System Reserved") ) || // don't filter system reserved windows 7 boot parts
-						 fileExists((WinPath="/Volumes/" + DiskLabel + "/Windows/system.ini")))
-					found=true;
-				else if (strstr(fsType,"Linux") && !strstr(fsType, "Linux_Swap"))
+				else if ((strstr(fsType,"Linux") ) && !strstr(fsType, "Linux_Swap"))
 					found=true; // Added Linux case
 				if (found)
 				{ //check if one of them exists
Index: trunk/ChameleonPrefPane/Sources/ShellProcess.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/ShellProcess.h	(revision 58)
+++ trunk/ChameleonPrefPane/Sources/ShellProcess.h	(revision 59)
@@ -16,7 +16,7 @@
 #include <string>
 #include "file_util.h"
 //----------------------------------------------------------------
-const int MAX_HD = 10;
+const int MAX_HD = 32;
 
 //----------------------------------------------------------------
 class ShellProcess 
@@ -66,10 +66,9 @@
 	bool fromPartitionHdString(const char * inHdStr);
 	std::string toHdStr() const 
 	{
-		std::string buf = "hd(n,m)";
-		buf[3]= '0'+disk();
-		buf[5]='0'+partition();
-		return buf;
+		char buf[16]="";
+		sprintf(buf, "hd(%d,%d)", disk(),partition());
+		return std::string(buf);
 	}
 	int imageIndexFromFs() const;
 protected:
Index: trunk/ChameleonPrefPane/Info.plist
===================================================================
--- trunk/ChameleonPrefPane/Info.plist	(revision 58)
+++ trunk/ChameleonPrefPane/Info.plist	(revision 59)
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0 b4</string>
+	<string>2.0 b5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>