Index: branches/blackosx/package/Scripts/Main/Standard/postinstall =================================================================== --- branches/blackosx/package/Scripts/Main/Standard/postinstall (revision 1615) +++ branches/blackosx/package/Scripts/Main/Standard/postinstall (revision 1616) @@ -29,7 +29,6 @@ #echo "" - # Initialise Script Globals stage0Loader="boot0" @@ -73,7 +72,7 @@ "$scriptDir"InstallLog.sh "${targetVolume}" "Installer version: ${versionNumber} ${revisionNumber}" "$scriptDir"InstallLog.sh "${targetVolume}" "Diskutil" "$scriptDir"InstallLog.sh "${targetVolume}" "Running Standard postinstall script" -"$scriptDir"InstallLog.sh "${targetVolume}" "Target volume = ${targetVolume}" +"$scriptDir"InstallLog.sh "${targetVolume}" "Target volume = ${targetVolume} on ${targetDevice}" # Double check we can see the selected partition and it's of the right type. Index: branches/blackosx/package/Scripts/Main/EFI/postinstall =================================================================== --- branches/blackosx/package/Scripts/Main/EFI/postinstall (revision 1615) +++ branches/blackosx/package/Scripts/Main/EFI/postinstall (revision 1616) @@ -76,8 +76,8 @@ "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Installer version: ${versionNumber} ${revisionNumber}" "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Diskutil" "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Running EFI postinstall script" -"$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Target selected by user = ${targetDeviceChosenByUser}" -"$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Target volume = ${targetVolume}" +"$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Target selected by user = ${targetVolumeChosenByUser} on ${targetDeviceChosenByUser}" +"$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Target volume = ${targetVolume} on ${targetDevice}" # Check to see if the selected disk uses a GPT Index: branches/blackosx/package/Scripts/Sub/WriteChameleonStage2.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/WriteChameleonStage2.sh (revision 1615) +++ branches/blackosx/package/Scripts/Sub/WriteChameleonStage2.sh (revision 1616) @@ -65,7 +65,7 @@ else #echo "DEBUG: Executing command: cp "${targetVolume}"/usr/standalone/i386/${stage2Loader} ${targetVolume}" cp "${targetVolume}"/usr/standalone/i386/"${stage2Loader}" "${targetVolume}" - "$scriptDir"InstallLog.sh "${targetVolume}" "Written boot to ${targetVolume}." + "$scriptDir"InstallLog.sh "${targetVolume}" "Written boot to ${targetVolume} on ${targetDevice}." fi #ĘCheck to see if the user wants to hide the boot file Index: branches/blackosx/package/Scripts/Sub/CheckDiskMicrocode.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/CheckDiskMicrocode.sh (revision 1615) +++ branches/blackosx/package/Scripts/Sub/CheckDiskMicrocode.sh (revision 1616) @@ -37,12 +37,7 @@ mbr437=$( dd 2>/dev/null if="$targetDisk" count=1 | dd 2>/dev/null count=1 bs=437 | perl -ne '@a=split"";for(@a){printf"%02x",ord}' ) #mbr437md5=$( dd 2>/dev/null if="$targetDisk" count=1 | dd 2>/dev/null count=1 bs=437 | md5 ) -#echo "DEBUG: ${mbr437}" - -if [ $( echo "${mbr437}" | awk -F0 '{print NF-1}' ) = 874 ]; then - echo "The first 437 bytes of the MBR Disk Sector is blank - Updating" - #"$scriptDir"InstallLog.sh "${targetVolume}" "Target has no bootcode in the MBR disk sector." -else +if [ $( echo "${mbr437}" | awk -F0 '{print NF-1}' ) != 874 ]; then # There is already something on the MBR # See if a Windows bootloader already exists @@ -50,7 +45,7 @@ windowsloader=$( dd 2>/dev/null if="$targetDisk" count=4 bs=1 | xxd | awk '{print $2$3}' ) if [ "${windowsloader}" == "33c08ed0" ] ; then #echo "DEBUG: Found existing Windows Boot Loader so will replace with Chameleon boot0md" - "$scriptDir"InstallLog.sh "${targetVolume}" "Target has existing Windows boot loader - Will replace with boot0md" + "$scriptDir"InstallLog.sh "${targetVolume}" "Target disk has existing Windows boot loader - Will replace with boot0md" fi # See if a Chameleon stage0 boot file already exists @@ -62,7 +57,7 @@ stage0type=$( dd 2>/dev/null if="$targetDisk" count=3 bs=1 skip=105 | xxd | awk '{print $2$3}' ) if [ "${stage0type}" == "0b807c" ]; then #echo "DEBUG: Target has existing Chameleon stage 0 loader - Boot0hfs" - "$scriptDir"InstallLog.sh "${targetVolume}" "Target has existing Chameleon stage 0 loader - boot0hfs" + "$scriptDir"InstallLog.sh "${targetVolume}" "Target disk already has existing Chameleon stage 0 loader - boot0hfs" # Script CheckDiskSignature.sh returned 0 if a Windows installation was NOT found if [ "$diskSigCheck" == "0" ]; then @@ -75,7 +70,7 @@ if [ "${stage0type}" == "0a803c" ]; then #echo "DEBUG: Found existing Chameleon stage 0 loader - Boot0" - "$scriptDir"InstallLog.sh "${targetVolume}" "Target has existing Chameleon stage 0 loader - boot0" + "$scriptDir"InstallLog.sh "${targetVolume}" "Target disk already has existing Chameleon stage 0 loader - boot0" # Script CheckDiskSignature.sh returned 1 if a Windows installation was found if [ "$diskSigCheck" = "1" ]; then @@ -89,7 +84,7 @@ if [ "${stage0type}" == "ee7505" ]; then #echo "DEBUG: Found existing Chameleon stage 0 loader - Boot0md" #echo "DEBUG: And will leave boot0md installed." - "$scriptDir"InstallLog.sh "${targetVolume}" "Target has existing Chameleon stage 0 loader - boot0md. Leaving as is." + "$scriptDir"InstallLog.sh "${targetVolume}" "Target disk already has existing Chameleon stage 0 loader - boot0md." exit 1 fi @@ -102,6 +97,9 @@ "$scriptDir"InstallLog.sh "${targetVolume}" "NOTE: Target has existing unrecognised bootcode in the MBR. Leaving as is." exit 1 fi +#else + #echo "DEBUG: The first 437 bytes of the MBR Disk Sector is blank - Updating" + #"$scriptDir"InstallLog.sh "${targetVolume}" "Target has no bootcode in the MBR disk sector." fi echo "diskupdate is now set to true." Index: branches/blackosx/package/Scripts/Sub/CheckProceed.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/CheckProceed.sh (revision 1615) +++ branches/blackosx/package/Scripts/Sub/CheckProceed.sh (revision 1616) @@ -116,9 +116,11 @@ if [ $stageExistence == 3 ] && [ $i -ne $sliceNumber ]; then #echo "DEBUG: STOP: There is already an existing Chameleon installation on $targetDiskRaw" "$scriptDir"InstallLog.sh "${installerVolume}" "STOP: There is already an existing Chameleon installation on $targetDiskRaw." - "$scriptDir"InstallLog.sh "${installerVolume}" "STOP: You could continue to install to $targetDeviceRaw, but you will have to" - "$scriptDir"InstallLog.sh "${installerVolume}" "STOP: control which partition is loaded by flagging the required partition active." - "$scriptDir"InstallLog.sh "${installerVolume}" "STOP: For now, please proceed by installing Chameleon manually." + "$scriptDir"InstallLog.sh "${installerVolume}" "NOTE: This is allowed and does work as long as you aren't dual booting Windows" + "$scriptDir"InstallLog.sh "${installerVolume}" "NOTE: from the same disk and are happy to control which partition is used by" + "$scriptDir"InstallLog.sh "${installerVolume}" "NOTE: flagging the required partition active. General use doesn't require two" + "$scriptDir"InstallLog.sh "${installerVolume}" "NOTE: Chameleon installs on the same disk, though might be done by advanced users." + "$scriptDir"InstallLog.sh "${installerVolume}" "NOTE: If you still want to do this then proceed by installing Chameleon manually." exit 1 fi done