Index: trunk/i386/libsaio/nvidia.c =================================================================== --- trunk/i386/libsaio/nvidia.c (revision 2137) +++ trunk/i386/libsaio/nvidia.c (revision 2138) @@ -1304,18 +1304,116 @@ { 0x10DE0FD1, 0x146210C7, "MSi GeForce GT 650M" }, { 0x10DE0FD1, 0x146210CD, "MSi GeForce GT 650M" }, + { 0x10DE0FD2, 0x101922DB, "Elitegroup GeForce GT 640M" }, + { 0x10DE0FD2, 0x10250646, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x10250648, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x1025066C, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x10250679, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x1025067D, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x10250681, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x10250682, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x10250683, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x10250684, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x10250686, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x1025068D, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x1025069E, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x1025071B, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x1025071D, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x10250733, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x10250734, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x10250735, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x10250736, "Acer GeForce GT 640M" }, + { 0x10DE0FD2, 0x1028054B, "Dell GeForce GT 640M" }, + { 0x10DE0FD2, 0x1028054F, "Dell GeForce GT 640M" }, { 0x10DE0FD2, 0x1028055F, "Dell GeForce GT 640M" }, + { 0x10DE0FD2, 0x10280595, "Dell GeForce GT 640M LE" }, + { 0x10DE0FD2, 0x102805B2, "Dell GeForce GT 640M LE" }, + { 0x10DE0FD2, 0x1043100D, "Asus GeForce GT 640M" }, + { 0x10DE0FD2, 0x104310AC, "Asus GeForce GT 640M" }, + { 0x10DE0FD2, 0x104310BC, "Asus GeForce GT 640M" }, + { 0x10DE0FD2, 0x104310CC, "Asus GeForce GT 640M" }, + { 0x10DE0FD2, 0x10431447, "Asus GeForce GT 640M" }, + { 0x10DE0FD2, 0x104315A7, "Asus GeForce GT 640M" }, + { 0x10DE0FD2, 0x10438533, "Asus GeForce GT 640M" }, + { 0x10DE0FD2, 0x104D9097, "Sony GeForce GT 640M" }, + { 0x10DE0FD2, 0x105B0D9A, "Foxconn GeForce GT 640M" }, + { 0x10DE0FD2, 0x1179FB01, "Toshiba GeForce GT 640M" }, + { 0x10DE0FD2, 0x1179FB05, "Toshiba GeForce GT 640M" }, + { 0x10DE0FD2, 0x1179FB12, "Toshiba GeForce GT 640M" }, + { 0x10DE0FD2, 0x1179FB18, "Toshiba GeForce GT 640M" }, + { 0x10DE0FD2, 0x1179FB1A, "Toshiba GeForce GT 640M" }, { 0x10DE0FD2, 0x144DC0D5, "Samsung GeForce GT 640M" }, + { 0x10DE0FD2, 0x14581542, "Gigabyte GeForce GT 640M" }, + { 0x10DE0FD2, 0x14582442, "Gigabyte GeForce GT 640M" }, + { 0x10DE0FD2, 0x146210B8, "MSi GeForce GT 640M" }, + { 0x10DE0FD2, 0x146210BA, "MSi GeForce GT 640M" }, + { 0x10DE0FD2, 0x146210D3, "MSi GeForce GT 640M" }, + { 0x10DE0FD2, 0x14C00066, "Compal GeForce GT 640M" }, + { 0x10DE0FD2, 0x152D0933, "Quanta GeForce GT 640M" }, + { 0x10DE0FD2, 0x152D0942, "Quanta GeForce GT 640M" }, + { 0x10DE0FD2, 0x152D0949, "Quanta GeForce GT 640M" }, + { 0x10DE0FD2, 0x152D0955, "Quanta GeForce GT 640M" }, + { 0x10DE0FD2, 0x152D0957, "Quanta GeForce GT 640M" }, + { 0x10DE0FD2, 0x152D0963, "Quanta GeForce GT 640M" }, + { 0x10DE0FD2, 0x152D0966, "Quanta GeForce GT 640M" }, + { 0x10DE0FD2, 0x15582701, "Clevo GeForce GT 640M" }, + { 0x10DE0FD2, 0x17AA3902, "Lenovo GeForce GT 640M" }, + { 0x10DE0FD2, 0x17AA3904, "Lenovo GeForce GT 640M" }, + { 0x10DE0FD2, 0x17AA3977, "Lenovo GeForce GT 640M" }, + { 0x10DE0FD2, 0x17AA5003, "Lenovo GeForce GT 640M" }, + { 0x10DE0FD2, 0x17AA5012, "Lenovo GeForce GT 640M" }, + { 0x10DE0FD2, 0x18540168, "LG GeForce GT 640M" }, + { 0x10DE0FD2, 0x18541808, "LG GeForce GT 640M" }, + { 0x10DE0FD2, 0x1B0A20C6, "Pegatron GeForce GT 640M" }, + { 0x10DE0FD2, 0x1B0A20DC, "Pegatron GeForce GT 640M" }, + { 0x10DE0FD2, 0x1B0A20DD, "Pegatron GeForce GT 640M" }, + { 0x10DE0FD2, 0x1B0A20DF, "Pegatron GeForce GT 640M" }, + { 0x10DE0FD2, 0x1B0A20E4, "Pegatron GeForce GT 640M" }, + { 0x10DE0FD2, 0x1B0A20E8, "Pegatron GeForce GT 640M" }, + { 0x10DE0FD2, 0x1B020AEC, "Pegatron GeForce GT 640M" }, + { 0x10DE0FD3, 0x10199995, "Elitegroup GeForce GT 640M LE" }, { 0x10DE0FD3, 0x10250713, "Acer GeForce GT 640M LE" }, { 0x10DE0FD3, 0x10250717, "Acer GeForce GT 640M LE" }, { 0x10DE0FD3, 0x104D909A, "Sony GeForce GT 640M LE" }, { 0x10DE0FD3, 0x104D909C, "Sony GeForce GT 640M LE" }, + { 0x10DE0FD3, 0x10CF175D, "Fujitsu GeForce GT 640M LE" }, + { 0x10DE0FD3, 0x10CF1764, "Fujitsu GeForce GT 640M LE" }, + { 0x10DE0FD3, 0x10CF1766, "Fujitsu GeForce GT 640M LE" }, + { 0x10DE0FD3, 0x10CF1768, "Fujitsu GeForce GT 640M LE" }, + { 0x10DE0FD3, 0x14C00065, "Compal GeForce GT 640M LE" }, + { 0x10DE0FD3, 0x14C00066, "Compal GeForce GT 640M LE" }, + { 0x10DE0FD3, 0x152D0923, "Quanta GeForce GT 640M LE" }, + { 0x10DE0FD3, 0x152D0924, "Quanta GeForce GT 640M LE" }, + { 0x10DE0FD3, 0x1A586747, "GeForce GT 640M LE" }, // SubVendor??? + { 0x10DE0FD4, 0x10280550, "Dell GeForce GTX 660M" }, { 0x10DE0FD4, 0x10280551, "Dell GeForce GTX 660M" }, { 0x10DE0FD4, 0x1028057B, "Dell GeForce GTX 660M" }, + { 0x10DE0FD4, 0x10280580, "Dell GeForce GTX 660M" }, + { 0x10DE0FD4, 0x1043102D, "Asus GeForce GTX 660M" }, + { 0x10DE0FD4, 0x10432115, "Asus GeForce GTX 660M" }, + { 0x10DE0FD4, 0x10432116, "Asus GeForce GTX 660M" }, + { 0x10DE0FD4, 0x10432117, "Asus GeForce GTX 660M" }, + { 0x10DE0FD4, 0x10432118, "Asus GeForce GTX 660M" }, + { 0x10DE0FD4, 0x1043212D, "Asus GeForce GTX 660M" }, { 0x10DE0FD4, 0x146210D7, "MSi GeForce GTX 660M" }, + { 0x10DE0FD4, 0x146210D8, "MSi GeForce GTX 660M" }, + { 0x10DE0FD4, 0x1179FB12, "Toshiba GeForce GTX 660M" }, + { 0x10DE0FD4, 0x1179FB18, "Toshiba GeForce GTX 660M" }, + { 0x10DE0FD4, 0x1179FB1A, "Toshiba GeForce GTX 660M" }, + { 0x10DE0FD4, 0x14582542, "Gigabyte GeForce GTX 660M" }, + { 0x10DE0FD4, 0x14586745, "Gigabyte GeForce GTX 660M" }, + { 0x10DE0FD4, 0x14586746, "Gigabyte GeForce GTX 660M" }, + { 0x10DE0FD4, 0x15583700, "Clevo GeForce GTX 660M" }, + { 0x10DE0FD4, 0x15585105, "Clevo GeForce GTX 660M" }, + { 0x10DE0FD4, 0x15587102, "Clevo GeForce GTX 660M" }, + { 0x10DE0FD4, 0x17AA3977, "Lenovo GeForce GTX 660M" }, + { 0x10DE0FD5, 0x106B0010, "Apple GeForce GTX 650M" }, + { 0x10DE0FD5, 0x106B00F2, "Apple GeForce GTX 650M" }, + { 0x10DE0FD5, 0x106B00FC, "Apple GeForce GTX 650M" }, + { 0x10DE0FDB, 0x104310AC, "Asus GK107-ESP-A1" }, { 0x10DE0FDB, 0x10431447, "Asus GK107-ESP-A1" }, { 0x10DE0FDB, 0x10432103, "Asus GK107-ESP-A1" }, Index: trunk/package/Scripts.templates/Post/postinstall =================================================================== --- trunk/package/Scripts.templates/Post/postinstall (revision 2137) +++ trunk/package/Scripts.templates/Post/postinstall (revision 2138) @@ -11,7 +11,7 @@ exit 1 fi -# If target volume root of current system then replace +# If target volume is root of current system then replace # / with volume name. if [ "$3" == "/" ]; then dest_vol="/Volumes/"$( ls -1F /Volumes | sed -n 's:@$::p' ) Index: trunk/package/Scripts.templates/Pre/preinstall =================================================================== --- trunk/package/Scripts.templates/Pre/preinstall (revision 2137) +++ trunk/package/Scripts.templates/Pre/preinstall (revision 2138) @@ -41,7 +41,7 @@ backupRootDir="${targetVolume}/Chameleon.Backups" backupDir="${backupRootDir}/"$( date -j "+%F-%Hh%M" ) -# Create the backup dirextory +# Create the backup directory mkdir -p "$backupDir" [[ -f "$logFile" ]] && mv "$logFile" "${backupDir}/${logName}" # Backup old log file @@ -57,12 +57,12 @@ echo "======================================================" >>"${logFile}" # --------------------------------------------- -# Backing up Chameleon files +# Backup Chameleon files # --------------------------------------------- -echo "Backing up Chameleon files" >>"${logFile}" +echo "Backup Chameleon files" >>"${logFile}" # Backup stage2 if [[ -f "${targetVolume}/boot" ]];then - echo "Backing up stage2 file ${targetVolume}/boot to ${backupDir}/boot" >>"${logFile}" + echo "Backup stage2 file ${targetVolume}/boot to ${backupDir}/boot" >>"${logFile}" cp -p "${targetVolume}/boot" "${backupDir}/boot" fi # Backup /Extra directory Index: trunk/package/OptionalSettings/KernelFlags.txt =================================================================== --- trunk/package/OptionalSettings/KernelFlags.txt (revision 2137) +++ trunk/package/OptionalSettings/KernelFlags.txt (revision 2138) @@ -30,4 +30,5 @@ List@Ignorecaches:Kernel Flags=-f List@Npci:Kernel Flags=npci=0x2000 List@Npci3:Kernel Flags=npci=0x3000 +List@WaitingRootDevice:Kernel Flags=ahcidisk=1 debug=8 List@Darkwake:Kernel Flags=darkwake=0 Index: trunk/package/Resources/templates/Localizable.strings =================================================================== --- trunk/package/Resources/templates/Localizable.strings (revision 2137) +++ trunk/package/Resources/templates/Localizable.strings (revision 2138) @@ -228,6 +228,11 @@ "Npci3_title" = "npci=0x3000"; "Npci3_description" = "For overcoming a hang at 'PCI configuration begin' on some systems. 0x3000 is the kIOPCIConfiguratorPFM64 flag, as seen in the IOPCIFamily source code."; +"WaitingRootDevice_title" = "ahcidisk=1 debug=8"; +"WaitingRootDevice_description" = "Info here: Waiting for root device when kernel cache used only with some disks +FIX +http://www.insanelymac.com/forum/topic/280062-waiting-for-root-device-when-kernel-cache-used-only-with-some-disks-fix/ +Findings credits to bcc9."; + "Darkwake_title" = "darkwake=0"; "Darkwake_description" = "Lion only. Disables the 'low power wake' feature which can sometimes leave the screen black after wake from sleep.";