Index: branches/cparm/TODO
===================================================================
--- branches/cparm/TODO	(revision 1735)
+++ branches/cparm/TODO	(revision 1736)
@@ -7,4 +7,6 @@
 
 - It seems that nvram variables must be set thru efiRuntimeServices->SetVariable(...),
   then, the /options node is filled by kernel depending on the Runtime Services.
-  If true, this requires a more complete EFI implementation (perhaps in a module, or a kext).
\ No newline at end of file
+  If true, this requires a more complete EFI implementation (perhaps in a module, or a kext).
+
+- Make an OS X server icon for LoginToLion
\ No newline at end of file
Index: branches/cparm/CHANGES
===================================================================
--- branches/cparm/CHANGES	(revision 1735)
+++ branches/cparm/CHANGES	(revision 1736)
@@ -1,7 +1,7 @@
 - Chameleon can now boot the Lion Auto-Installer partition (additionally, on a GPT disk this enable the option "Localize my Mac" of iCloud)
 - Added a first version of amlsgn (NOTE: This tool can can sign an aml file for your machine (with the UUID) or for your machine model, this can be useful 
-  with multiple machines w/o an identical model, combined with acpicodec and the option "LoadSignedAmlOnly", you can make sure that Chameleon will load the good 
-  aml files (even if you have about 50 dsdt files named differently in your Acpi directory and each one for a different machine) )
+  with multiple machines w/o an identical model, combined with acpicodec and the option "LoadSignedAmlOnly", you can make sure that Chameleon will load the 
+  good aml files for your machine (even if you have for example about 50 dsdt files named differently in your Acpi directory and each one for a different machine) )
 - Applied Guerrero's patch on gui.c (http://forge.voodooprojects.org/p/chameleon/issues/view/attachment/152/gui.diff)
 - Added a theme compatible with the OS detection/Volume feature (credit to Enzo for LoginToLion, see http://forum.voodooprojects.org/index.php?topic=2125.0 for more.)
 - Fixed a mistake with the smbios.plist loading process
Index: branches/cparm/i386/libsaio/disk.c
===================================================================
--- branches/cparm/i386/libsaio/disk.c	(revision 1735)
+++ branches/cparm/i386/libsaio/disk.c	(revision 1736)
@@ -1534,12 +1534,11 @@
 	}
 	else 
 	{
-		sprintf(dirSpec, "hd(%d,%d)/System/Library/CoreServices/", BIOS_DEV_UNIT(bvr), bvr->part_no);
+		sprintf(dirSpec, "hd(%d,%d)/System/Library/CoreServices/ServerVersion.plist", BIOS_DEV_UNIT(bvr), bvr->part_no);
 		
 		if (!loadConfigFile(dirSpec, &systemVersion))
-		{
-			sprintf(dirSpec, "hd(%d,%d)/System/Library/CoreServices/ServerVersion.plist", BIOS_DEV_UNIT(bvr), bvr->part_no);
-			
+		{	
+            bvr->OSisServer = true;
 			valid = true;
 		}
 		else 
Index: branches/cparm/i386/libsaio/saio_types.h
===================================================================
--- branches/cparm/i386/libsaio/saio_types.h	(revision 1735)
+++ branches/cparm/i386/libsaio/saio_types.h	(revision 1736)
@@ -208,6 +208,7 @@
     bool             filtered;        /* newFilteredBVChain() will set to TRUE */
     bool             visible;         /* will shown in the device list */
     char			 OSVersion[8];
+    bool             OSisServer;        /* Basically mean that OS X server is installed on this partition, not to be confused with Platform->CPU.isServer which means it tries to emulate an xserve in the smbios */
 };
 
 enum {