Index: branches/ErmaC/Trunk/i386/libsaio/ati.c
===================================================================
--- branches/ErmaC/Trunk/i386/libsaio/ati.c	(revision 1754)
+++ branches/ErmaC/Trunk/i386/libsaio/ati.c	(revision 1755)
@@ -564,7 +564,7 @@
 
 	{ 0x68D8,	0x5690174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",				kNull		},
 	{ 0x68D8,	0x5730174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5730",				kNull		},
-	{ 0x68D8,	0xE151174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",				kBaboon		},
+	{ 0x68D8,	0xE151174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",				kEulemur		},
 
 	{ 0x68D8,	0x30001787, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5730",				kNull		},
 
Index: branches/ErmaC/Trunk/package/Changes.txt
===================================================================
--- branches/ErmaC/Trunk/package/Changes.txt	(revision 1754)
+++ branches/ErmaC/Trunk/package/Changes.txt	(revision 1755)
@@ -1,5 +1,19 @@
-- Keylayout / Keymaps fixed and made a mandatory install.
+- Change Localizable.strings to match the recent changes to the install process.
 
+- Improve messages written to the installation log.
+
+- Change upgrade install to only backup /Extra folder if necessary.
+
+- JrCs - Enhanced installer - We can add an option without an associated package - We can have an option that install
+multiple packages - No more "fake" option (none) - The package that is build is already compressed (no need to
+compress it again)
+
+- JrCs - Update postinstall script - Fix a bug where kernel flags are not set properly - Fix indent - Add some comments.
+
+- JrCs - Automaticaly select upgrade option if /Extra/org.chameleon.Boot.plist file exists on the target volume.
+
+- JrCs - Keylayout / Keymaps fixed and made a mandatory install when a keymap is chosen.
+
 - Add option to upgrade an existing install - or more exactly, merge newly selected options with an existing /Extra folder. Also, rename an existing /Extra/com.apple.Boot.plist to /Extra/org.chameleon.Boot.plist.
 
 - Change the layout/wording displayed in the installer (English only) and give it a facelift. Adjust background image to scale to fit in the window.
@@ -44,4 +58,4 @@
 
 - slimpkg.sh changed to match the revised code in buildpkg.sh where applicable.
 
-- English Localizable.strings revised to match latest additions and some texts updated.
\ No newline at end of file
+- English Localizable.strings revised to match latest additions and some texts updated.
Index: branches/ErmaC/Trunk/package/Resources/ar.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Trunk/package/Resources/it.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Trunk/package/Resources/bg.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Trunk/package/buildpkg.sh
===================================================================
--- branches/ErmaC/Trunk/package/buildpkg.sh	(revision 1754)
+++ branches/ErmaC/Trunk/package/buildpkg.sh	(revision 1755)
@@ -117,7 +117,7 @@
     cp -f ${pkgroot}/Scripts/Sub/InstallLog.sh ${1}/${choiceId}/Scripts
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
     addChoice "${choiceId}"  "start_visible=\"false\" start_selected=\"true\""  "$packageRefId"
 # End build pre install package
 
@@ -140,7 +140,7 @@
     ditto --noextattr --noqtn ${1%/*}/i386/bdmesg   ${1}/${choiceId}/Root/usr/local/bin
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
     addChoice "${choiceId}"  "start_visible=\"false\" start_selected=\"true\""  "$packageRefId"
 # End build core package
 
@@ -158,7 +158,7 @@
     echo "" > "${1}/${choiceId}/Root/install_type_new"
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
     exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
     addChoice "${choiceId}"  "start_selected=\"!choices['Upgrade'].selected\" selected=\"${exclusiveChoice}\""  "$packageRefId"
     # End build new install package
@@ -169,7 +169,7 @@
     echo "" > "${1}/${choiceId}/Root/install_type_upgrade"
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
     exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
     addChoice "${choiceId}"  "start_selected=\"chameleon_boot_plist_exists()\" selected=\"${exclusiveChoice}\""  "$packageRefId"
     # End build upgrade package
@@ -195,7 +195,7 @@
     ditto --arch i386 `which SetFile` ${1}/${choiceId}/Scripts/Resources/SetFile
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
     exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
     addChoice "${choiceId}"  "start_selected=\"true\" selected=\"${exclusiveChoice}\""  "$packageRefId"
     # End build standard package
@@ -209,7 +209,7 @@
     ditto --arch i386 `which SetFile` ${1}/${choiceId}/Scripts/Resources/SetFile
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
     exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
     addChoice "${choiceId}"  "start_visible=\"systemHasGPT()\" start_selected=\"false\" selected=\"${exclusiveChoice}\""  "$packageRefId"
     # End build efi package
@@ -219,7 +219,7 @@
     mkdir -p ${1}/${choiceId}/Root
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
     exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
     addChoice "${choiceId}"  "start_selected=\"false\" selected=\"${exclusiveChoice}\""  "$packageRefId"
     # End build no bootloader choice package
@@ -253,7 +253,7 @@
             ditto --noextattr --noqtn ${1%/*}/i386/modules/${choiceId}.dylib ${1}/${choiceId}/Root
             echo -e "\t[BUILD] ${choiceId} "
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
             addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
             # End build klibc package module
         }
@@ -268,7 +268,7 @@
             ditto --noextattr --noqtn ${1%/*}/i386/modules/uClibcxx.dylib ${1}/${choiceId}/Root
             echo -e "\t[BUILD] ${choiceId} "
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
             # Add the klibc package because the uClibc module is dependent of klibc module
             addChoice "${choiceId}"  "start_selected=\"false\""  \
              "$packageRefId" $(getPackageRefId "${modules_packages_identity}" "klibc")
@@ -285,7 +285,7 @@
             ditto --noextattr --noqtn ${1%/*}/i386/modules/Resolution.dylib ${1}/${choiceId}/Root
             echo -e "\t[BUILD] ${choiceId} "
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
             addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
             # End build Resolution package module
         }
@@ -313,7 +313,7 @@
             ditto --noextattr --noqtn ${1%/*}/i386/cham-mklayout ${1}/${choiceId}/Root/usr/local/bin
             echo -e "\t[BUILD] ${choiceId} "
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
 
             # Don't add a choice for Keylayout module
             # addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
@@ -393,7 +393,7 @@
 
 			echo -e "\t[BUILD] ${optionName} "
 			packageRefId=$(getPackageRefId "${packagesidentity}" "${optionName}")
-			buildpackage "$packageRefId" "${optionName}" "${1}/${optionName}" "/$chamTemp/options" >/dev/null 2>&1
+			buildpackage "$packageRefId" "${optionName}" "${1}/${optionName}" "/$chamTemp/options" # >/dev/null 2>&1
 			exclusiveSelect=""
 			if [[ ${exclusiveFlag} -eq 1 ]];then
 				exclusiveSelect="selected=\"$(exclusive_zero_or_one_choice "$optionName" "$allChoices")\""
@@ -432,7 +432,7 @@
 
 		echo -e "\t[BUILD] ${choiceId} "
 		packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-		buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/options" >/dev/null 2>&1
+		buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/options" # >/dev/null 2>&1
 		exclusiveChoice=$(exclusive_zero_or_one_choice "$choiceId" "$allChoices")
 		# Add the Keylayout package because the Keylayout module is needed
 		addChoice "${choiceId}"  "start_selected=\"false\" selected=\"${exclusiveChoice}\""  \
@@ -465,7 +465,7 @@
 		rsync -r --exclude=.svn "${themes[$i]}/" "${1}/${theme}/Root/${theme}"
 		echo -e "\t[BUILD] ${theme}"
 		packageRefId=$(getPackageRefId "${packagesidentity}" "${theme}")
-		buildpackage "$packageRefId" "${theme}" "${1}/${theme}" "/$chamTemp/Extra/Themes" >/dev/null 2>&1
+		buildpackage "$packageRefId" "${theme}" "${1}/${theme}" "/$chamTemp/Extra/Themes" # >/dev/null 2>&1
 		addChoice "${theme}"  "start_selected=\"false\""  "$packageRefId"
 	done
 
@@ -486,7 +486,7 @@
     ditto --noextattr --noqtn ${1%/*/*}/version ${1}/${choiceId}/Scripts/Resources/version
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
     addChoice "${choiceId}"  "start_visible=\"false\" start_selected=\"true\""  "$packageRefId"
 # End build post install package
 
Index: branches/ErmaC/Trunk/CHANGES
===================================================================
--- branches/ErmaC/Trunk/CHANGES	(revision 1754)
+++ branches/ErmaC/Trunk/CHANGES	(revision 1755)
@@ -5,6 +5,11 @@
   disabled by default: http://forum.voodooprojects.org/index.php/topic,2158.0.html
 - Added exFAT volume label support (FAT64) support (credit to dmazar):
   http://forum.voodooprojects.org/index.php/topic,2095.0.html
+- disableIRQs() http://www.insanelymac.com/forum/index.php?s=&showtopic=255866&view=findpost&p=1677779
+  Port of original patch by: CPARM (who basically did this in boot.c) Thanks!
+  The ACPI specification dictates that the 8259 (PC-AT compatible) vectors
+  must be disabled (that is, masked) when enabling the ACPI APIC operation
+  but this isn't done (apparently) on all mobo's and thus we do that here.
 - Added AtiPorts option to GraphicsEnabler, so users can override the default number of ports. It proved
   to be useful when used to limit the number of ports that a framebuffer registers, which seems to be a
   requirement on laptops that can only use 2 ports at the same time.
Index: branches/ErmaC/Modules/i386/modules/NVIDIAGraphicsEnabler/nvidia.c
===================================================================
--- branches/ErmaC/Modules/i386/modules/NVIDIAGraphicsEnabler/nvidia.c	(revision 1754)
+++ branches/ErmaC/Modules/i386/modules/NVIDIAGraphicsEnabler/nvidia.c	(revision 1755)
@@ -755,9 +755,9 @@
 	{ 0x10DE0DC5, "GeForce GTS 450" },
 	{ 0x10DE0DC6, "GeForce GTS 450" },
 	{ 0x10DE0DCA, "GF10x" },
-	// 0DD0 - 0DDF	
 	{ 0x10DE0DCD, "GeForce GT 555M" }, // ErmaC
 	{ 0x10DE0DCE, "GeForce GT 555M" }, // ErmaC
+	// 0DD0 - 0DDF	
 	{ 0x10DE0DD1, "GeForce GTX 460M" },
 	{ 0x10DE0DD2, "GeForce GT 445M" },
 	{ 0x10DE0DD3, "GeForce GT 435M" },
@@ -845,8 +845,8 @@
 	{ 0x10DE1057, "NVS 4200M" }, // ErmaC
 	// 1060 - 106F
 	// 1070 - 107F
+	{ 0x10DE107F, "NVIDIA GF119-ES" }, // ErmaC
 	// 1080 - 108F
-	{ 0x10DE107F, "NVIDIA GF119-ES" }, // ErmaC
 	{ 0x10DE1080, "GeForce GTX 580" },
 	{ 0x10DE1081, "GeForce GTX 570" },
 	{ 0x10DE1082, "GeForce GTX 560 Ti" },
@@ -1062,7 +1062,7 @@
 							channel1 |= ( 0x1 << entries[i].index);
 							entries[i].type = TYPE_GROUPED;
 							
-							if ((entries[i-1].type == 0x0))
+							if ( entries[i-1].type == 0x0 )
 							{
 								channel1 |= ( 0x1 << entries[i-1].index);
 								entries[i-1].type = TYPE_GROUPED;
@@ -1081,7 +1081,7 @@
 							channel2 |= ( 0x1 << entries[i].index);
 							entries[i].type = TYPE_GROUPED;
 							
-							if ((entries[i - 1].type == 0x0))
+							if ( entries[i - 1].type == 0x0 )
 							{
 								channel2 |= ( 0x1 << entries[i-1].index);
 								entries[i-1].type = TYPE_GROUPED;
@@ -1259,12 +1259,14 @@
 		vram_size *= REG32(NVC0_MEM_CTRLR_COUNT);
 	}
 	
-	// Workaround for GT 420/430 & 9600M GT
+	// Workaround for 9600M GT, GT 420/430/440 & GT 525M
 	switch (nvda_dev->device_id)
 	{
+		case 0x0649: vram_size = 512*1024*1024; break;	// 9600M GT
+		case 0x0DE0: vram_size = 1024*1024*1024; break; // GT 440
 		case 0x0DE1: vram_size = 1024*1024*1024; break; // GT 430
 		case 0x0DE2: vram_size = 1024*1024*1024; break; // GT 420
-		case 0x0649: vram_size = 512*1024*1024; break;	// 9600M GT
+		case 0x0DEC: vram_size = 1024*1024*1024; break; // GT 525M
 		default: break;
 	}
 	
Index: branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c
===================================================================
--- branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c	(revision 1754)
+++ branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c	(revision 1755)
@@ -509,7 +509,7 @@
 
 	{ 0x689C,	0x30201682, CHIP_FAMILY_HEMLOCK,	"ATI Radeon HD 5970",				kUakari		, 0 },
 
-	{ 0x68A0,	0x043A1028,	CHIP_FAMILY_BROADWAY,	"ATI Mobility Radeon HD 5870",			kNull	, 0 }, // ErmaC
+	{ 0x68A0,	0x043A1028,	CHIP_FAMILY_BROADWAY,	"ATI Mobility Radeon HD 5870",			kNomascus	, 0 }, // ErmaC
 
 	{ 0x68A1,	0x144D103C,	CHIP_FAMILY_CYPRESS,	"ATI Mobility Radeon HD 5850",			kNomascus	, 0 },
 	{ 0x68A1,	0x1522103C, CHIP_FAMILY_CYPRESS,	"ATI Mobility Radeon HD 5850",			kHoolock	, 0 },
@@ -520,7 +520,8 @@
 
 	{ 0x68B8,	0x00CF106B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kHoolock	, 0 },
 
-	{ 0x68B8,	0x21f61458, CHIP_FAMILY_JUNIPER,	"GigaByte HD5770 R577SL-1GD",			kVervet		, 0 }, // ErmaC
+	{ 0x68B8,	0x21D71458, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		, 0 },
+	{ 0x68B8,	0x21F61458, CHIP_FAMILY_JUNIPER,	"GigaByte HD5770 R577SL-1GD",			kVervet		, 0 }, // ErmaC
 
 	{ 0x68B8,	0x29901682, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		, 0 },
 	{ 0x68B8,	0x29911682, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		, 0 },
@@ -529,8 +530,6 @@
 	{ 0x68B8,	0xE144174B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kHoolock	, 0 }, // ErmaC
 	{ 0x68B8,	0xE147174B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		, 0 },
 
-	{ 0x68B8,	0x21D71458, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		, 0 },
-
 	{ 0x68B8,	0x200A1787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		, 0 }, // ErmaC
 	{ 0x68B8,	0x200B1787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		, 0 },
 	{ 0x68B8,	0x22881787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		, 0 },
@@ -572,7 +571,7 @@
 
 	{ 0x68D8,	0x5690174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",				kNull		, 0 },
 	{ 0x68D8,	0x5730174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5730",				kNull		, 0 },
-	{ 0x68D8,	0xE151174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",				kBaboon		, 0 },
+	{ 0x68D8,	0xE151174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",				kEulemur	, 0 },
 
 	{ 0x68D8,	0x30001787, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5730",				kNull		, 0 },
 
@@ -593,9 +592,9 @@
 
 	{ 0x68E1,	0x1426103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	, 0 },
 
-	{ 0x68F9,	0x010E1002, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kNull		, 0 }, // ErmaC
+	{ 0x68F9,	0x010E1002, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur		, 0 }, // ErmaC
 
-	{ 0x68F9,	0x03741043, CHIP_FAMILY_CEDAR,		"ASUS EAH5450",                     kNull		, 0 }, // ErmaC
+	{ 0x68F9,	0x03741043, CHIP_FAMILY_CEDAR,		"ASUS EAH5450",                     kEulemur		, 0 }, // ErmaC
 
 	{ 0x68F9,	0x5470174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",				kNull		, 0 },
 	{ 0x68F9,	0x5490174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5490",				kNull		, 0 },
@@ -620,15 +619,16 @@
 	{ 0x6718,	0x67181002, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kNull		, 0 },
 	{ 0x6718,	0x31301682, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kNull		, 0 },
 
-	{ 0x6719,	0x0B001002, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kNull		, 0 }, // ErmaC
+	{ 0x6719,	0x0B001002, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kGibba		, 0 }, // ErmaC
 	{ 0x6719,	0x186B174B, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kNull		, 0 }, // ErmaC
-	{ 0x6719,	0x20101787, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kNull		, 0 }, // ErmaC
+	{ 0x6719,	0x20101787, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kGibba		, 0 }, // ErmaC
 
 	{ 0x671D,	0x10020B2A, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6990",				kNull		, 0 }, // ErmaC
 	{ 0x671D,	0x10021B2A, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6990",				kNull		, 0 }, // ErmaC
 	{ 0x671D,	0x16823160, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6990",				kNull		, 0 }, // ErmaC
 
-	{ 0x6720,	0x04BA1028, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6970m",				kElodea		, 0 }, // ErmaC
+	{ 0x6720,	0x04901028, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6970M",				kNull		, 0 }, // ErmaC
+	{ 0x6720,	0x04BA1028, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6970M",				kElodea		, 0 }, // ErmaC
 
 	{ 0x6738,	0x00D01002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	, 0 },
 	{ 0x6738,	0x174B174B, CHIP_FAMILY_BARTS,		"Sapphire Radeon HD6870",			kBulrushes	, 0 }, // ErmaC
@@ -647,6 +647,7 @@
 	{ 0x6738,	0x20101787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	, 0 },
 	{ 0x6738,	0x23051787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	, 0 },
 
+	{ 0x6739,	0xAA881002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	, 0 },
 	{ 0x6739,	0x03B41043, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	, 0 }, // ErmaC
 	{ 0x6739,	0x21F81458, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kBulrushes	, 0 }, // ErmaC
 	{ 0x6739,	0x24411462, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	, 0 },
@@ -680,7 +681,8 @@
 
 	{ 0x6760,	0x04CC1028, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6490M",				kNull		, 0 },
 
-	{ 0x6760,	0x167D103C, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6490M",				kNull		, 0 }, // ErmaC
+	{ 0x6760,	0x165A103C, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",				kNull		, 0 },
+	{ 0x6760,	0x167D103C, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",				kNull		, 0 }, // ErmaC
 
 	{ 0x6760,	0x1CB21043, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",				kNull		, 0 },
 
@@ -757,12 +759,13 @@
 	{ 0x689C,	0x00000000, CHIP_FAMILY_HEMLOCK,	"ATI Radeon HD 5900 Series",			kUakari		, 0 },
 	{ 0x689E,	0x00000000, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5800 Series",			kUakari		, 0 },
 
-	{ 0x68A0,	0x00000000, CHIP_FAMILY_BROADWAY,	"ATI Mobility Radeon HD 5800 Series",	kNull		, 0 }, // ErmaC
+	{ 0x68A0,	0x00000000, CHIP_FAMILY_BROADWAY,	"ATI Mobility Radeon HD 5800 Series",	kNomascus		, 0 }, // ErmaC
 	{ 0x68A1,	0x00000000, CHIP_FAMILY_BROADWAY,	"ATI Mobility Radeon HD 5800 Series",	kNull		, 0 }, // ErmaC
 	{ 0x68B0,	0x00000000, CHIP_FAMILY_BROADWAY,	"ATI Mobility Radeon HD 5800 Series",	kNull		, 0 }, // ErmaC
 
 	{ 0x68B8,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5700 Series",			kVervet		, 0 },
 	{ 0x68B9,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5600 Series",			kVervet		, 0 },
+	{ 0x68BA,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6770 Series",			kVervet		, 0 },
 	{ 0x68BE,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5700 Series",			kVervet		, 0 },
 
 	{ 0x68D8,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5600 Series",			kBaboon		, 0 },
@@ -773,7 +776,7 @@
 
 	/* Northen Islands */
 	{ 0x6718,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970 Series",			kNull		, 0 },
-	{ 0x6719,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950 Series",			kNull		, 0 },
+	{ 0x6719,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950 Series",			kGibba		, 0 },
 
 	{ 0x671D,	0x00000000, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6900 Series",			kNull		, 0 }, // ErmaC
 	{ 0x671F,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6900 Series",			kNull		, 0 }, // ErmaC
Index: branches/ErmaC/Modules/package/Changes.txt
===================================================================
--- branches/ErmaC/Modules/package/Changes.txt	(revision 1754)
+++ branches/ErmaC/Modules/package/Changes.txt	(revision 1755)
@@ -1,5 +1,19 @@
-- Keylayout / Keymaps fixed and made a mandatory install.
+- Change Localizable.strings to match the recent changes to the install process.
 
+- Improve messages written to the installation log.
+
+- Change upgrade install to only backup /Extra folder if necessary.
+
+- JrCs - Enhanced installer - We can add an option without an associated package - We can have an option that install
+multiple packages - No more "fake" option (none) - The package that is build is already compressed (no need to
+compress it again)
+
+- JrCs - Update postinstall script - Fix a bug where kernel flags are not set properly - Fix indent - Add some comments.
+
+- JrCs - Automaticaly select upgrade option if /Extra/org.chameleon.Boot.plist file exists on the target volume.
+
+- JrCs - Keylayout / Keymaps fixed and made a mandatory install when a keymap is chosen.
+
 - Add option to upgrade an existing install - or more exactly, merge newly selected options with an existing /Extra folder. Also, rename an existing /Extra/com.apple.Boot.plist to /Extra/org.chameleon.Boot.plist.
 
 - Change the layout/wording displayed in the installer (English only) and give it a facelift. Adjust background image to scale to fit in the window.
@@ -44,4 +58,4 @@
 
 - slimpkg.sh changed to match the revised code in buildpkg.sh where applicable.
 
-- English Localizable.strings revised to match latest additions and some texts updated.
\ No newline at end of file
+- English Localizable.strings revised to match latest additions and some texts updated.
Index: branches/ErmaC/Modules/package/Resources/ar.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Modules/package/Resources/it.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Modules/package/Resources/bg.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Modules/package/buildpkg.sh
===================================================================
--- branches/ErmaC/Modules/package/buildpkg.sh	(revision 1754)
+++ branches/ErmaC/Modules/package/buildpkg.sh	(revision 1755)
@@ -117,7 +117,7 @@
     cp -f ${pkgroot}/Scripts/Sub/InstallLog.sh ${1}/${choiceId}/Scripts
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
     addChoice "${choiceId}"  "start_visible=\"false\" start_selected=\"true\""  "$packageRefId"
 # End build pre install package
 
@@ -140,7 +140,7 @@
     ditto --noextattr --noqtn ${1%/*}/i386/bdmesg   ${1}/${choiceId}/Root/usr/local/bin
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
     addChoice "${choiceId}"  "start_visible=\"false\" start_selected=\"true\""  "$packageRefId"
 # End build core package
 
@@ -158,7 +158,7 @@
     echo "" > "${1}/${choiceId}/Root/install_type_new"
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
     exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
     addChoice "${choiceId}"  "start_selected=\"!choices['Upgrade'].selected\" selected=\"${exclusiveChoice}\""  "$packageRefId"
     # End build new install package
@@ -169,7 +169,7 @@
     echo "" > "${1}/${choiceId}/Root/install_type_upgrade"
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
     exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
     addChoice "${choiceId}"  "start_selected=\"chameleon_boot_plist_exists()\" selected=\"${exclusiveChoice}\""  "$packageRefId"
     # End build upgrade package
@@ -195,7 +195,7 @@
     ditto --arch i386 `which SetFile` ${1}/${choiceId}/Scripts/Resources/SetFile
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
     exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
     addChoice "${choiceId}"  "start_selected=\"true\" selected=\"${exclusiveChoice}\""  "$packageRefId"
     # End build standard package
@@ -209,7 +209,7 @@
     ditto --arch i386 `which SetFile` ${1}/${choiceId}/Scripts/Resources/SetFile
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
     exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
     addChoice "${choiceId}"  "start_visible=\"systemHasGPT()\" start_selected=\"false\" selected=\"${exclusiveChoice}\""  "$packageRefId"
     # End build efi package
@@ -219,7 +219,7 @@
     mkdir -p ${1}/${choiceId}/Root
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
     exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
     addChoice "${choiceId}"  "start_selected=\"false\" selected=\"${exclusiveChoice}\""  "$packageRefId"
     # End build no bootloader choice package
@@ -257,7 +257,7 @@
             ditto --noextattr --noqtn ${1%/*}/i386/modules/${choiceId}.dylib ${1}/${choiceId}/Root
             echo -e "\t[BUILD] ${choiceId} "
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
             addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
             # End build klibc package module
         }
@@ -272,7 +272,7 @@
             ditto --noextattr --noqtn ${1%/*}/i386/modules/uClibcxx.dylib ${1}/${choiceId}/Root
             echo -e "\t[BUILD] ${choiceId} "
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
             # Add the klibc package because the uClibc module is dependent of klibc module
             addChoice "${choiceId}"  "start_selected=\"false\""  \
              "$packageRefId" $(getPackageRefId "${modules_packages_identity}" "klibc")
@@ -289,7 +289,7 @@
             ditto --noextattr --noqtn ${1%/*}/i386/modules/Resolution.dylib ${1}/${choiceId}/Root
             echo -e "\t[BUILD] ${choiceId} "
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
             addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
             # End build Resolution package module
         }
@@ -317,7 +317,7 @@
             ditto --noextattr --noqtn ${1%/*}/i386/cham-mklayout ${1}/${choiceId}/Root/usr/local/bin
             echo -e "\t[BUILD] ${choiceId} "
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
 
             # Don't add a choice for Keylayout module
             # addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
@@ -335,7 +335,7 @@
             ditto --noextattr --noqtn ${1%/*}/i386/modules/AMDGraphicsEnabler.dylib ${1}/${choiceId}/Root
             echo -e "\t[BUILD] ${choiceId} "
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
             addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
             # End build AMDGraphicsEnabler package module
         }
@@ -351,7 +351,7 @@
             ditto --noextattr --noqtn ${1%/*}/i386/modules/ATiGraphicsEnabler.dylib ${1}/${choiceId}/Root
             echo -e "\t[BUILD] ${choiceId} "
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
             addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
             # End build ATiGraphicsEnabler package module
         }
@@ -367,7 +367,7 @@
             ditto --noextattr --noqtn ${1%/*}/i386/modules/IntelGraphicsEnabler.dylib ${1}/${choiceId}/Root
             echo -e "\t[BUILD] ${choiceId} "
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
             addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
             # End build IntelGraphicsEnabler package module
         }
@@ -383,7 +383,7 @@
             ditto --noextattr --noqtn ${1%/*}/i386/modules/NVIDIAGraphicsEnabler.dylib ${1}/${choiceId}/Root
             echo -e "\t[BUILD] ${choiceId} "
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
             addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
             # End build NVIDIAGraphicsEnabler package module
         }
@@ -461,7 +461,7 @@
 
 			echo -e "\t[BUILD] ${optionName} "
 			packageRefId=$(getPackageRefId "${packagesidentity}" "${optionName}")
-			buildpackage "$packageRefId" "${optionName}" "${1}/${optionName}" "/$chamTemp/options" >/dev/null 2>&1
+			buildpackage "$packageRefId" "${optionName}" "${1}/${optionName}" "/$chamTemp/options" # >/dev/null 2>&1
 			exclusiveSelect=""
 			if [[ ${exclusiveFlag} -eq 1 ]];then
 				exclusiveSelect="selected=\"$(exclusive_zero_or_one_choice "$optionName" "$allChoices")\""
@@ -500,7 +500,7 @@
 
 		echo -e "\t[BUILD] ${choiceId} "
 		packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-		buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/options" >/dev/null 2>&1
+		buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/$chamTemp/options" # >/dev/null 2>&1
 		exclusiveChoice=$(exclusive_zero_or_one_choice "$choiceId" "$allChoices")
 		# Add the Keylayout package because the Keylayout module is needed
 		addChoice "${choiceId}"  "start_selected=\"false\" selected=\"${exclusiveChoice}\""  \
@@ -533,7 +533,7 @@
 		rsync -r --exclude=.svn "${themes[$i]}/" "${1}/${theme}/Root/${theme}"
 		echo -e "\t[BUILD] ${theme}"
 		packageRefId=$(getPackageRefId "${packagesidentity}" "${theme}")
-		buildpackage "$packageRefId" "${theme}" "${1}/${theme}" "/$chamTemp/Extra/Themes" >/dev/null 2>&1
+		buildpackage "$packageRefId" "${theme}" "${1}/${theme}" "/$chamTemp/Extra/Themes" # >/dev/null 2>&1
 		addChoice "${theme}"  "start_selected=\"false\""  "$packageRefId"
 	done
 
@@ -554,7 +554,7 @@
     ditto --noextattr --noqtn ${1%/*/*}/version ${1}/${choiceId}/Scripts/Resources/version
     echo -e "\t[BUILD] ${choiceId} "
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" >/dev/null 2>&1
+    buildpackage "$packageRefId" "${choiceId}" "${1}/${choiceId}" "/" # >/dev/null 2>&1
     addChoice "${choiceId}"  "start_visible=\"false\" start_selected=\"true\""  "$packageRefId"
 # End build post install package
 
Index: branches/ErmaC/Modules/CHANGES
===================================================================
--- branches/ErmaC/Modules/CHANGES	(revision 1754)
+++ branches/ErmaC/Modules/CHANGES	(revision 1755)
@@ -5,6 +5,11 @@
   disabled by default: http://forum.voodooprojects.org/index.php/topic,2158.0.html
 - Added exFAT volume label support (FAT64) support (credit to dmazar):
   http://forum.voodooprojects.org/index.php/topic,2095.0.html
+- disableIRQs() http://www.insanelymac.com/forum/index.php?s=&showtopic=255866&view=findpost&p=1677779
+  Port of original patch by: CPARM (who basically did this in boot.c) Thanks!
+  The ACPI specification dictates that the 8259 (PC-AT compatible) vectors
+  must be disabled (that is, masked) when enabling the ACPI APIC operation
+  but this isn't done (apparently) on all mobo's and thus we do that here.
 - Added AtiPorts option to GraphicsEnabler, so users can override the default number of ports. It proved
   to be useful when used to limit the number of ports that a framebuffer registers, which seems to be a
   requirement on laptops that can only use 2 ports at the same time.