Index: branches/blackosx/package/Scripts/EFI/postinstall =================================================================== --- branches/blackosx/package/Scripts/EFI/postinstall (revision 1557) +++ branches/blackosx/package/Scripts/EFI/postinstall (revision 1558) @@ -71,7 +71,7 @@ # Write some information to the Install Log "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Running EFI postinstall script -Target volume Selected by user = ${targetVolumeChosenByUser} +Target volume selected by user = ${targetVolumeChosenByUser} Target volume = ${targetVolume}" @@ -141,12 +141,12 @@ # OK to proceed if [ ${diskupdate} = "0" ]; then - echo "Diskupdate = true, so the stage 0 loader can be written to the MBR" + #echo "Diskupdate = true, so the stage 0 loader can be written to the MBR" # Write the stage 0 loader to the MBR "$scriptDir"WriteChameleonStage0.sh "${diskSigCheck}" "${stage0Loader}" "${stage0LoaderDualBoot}" "${targetDisk}" "${targetVolumeChosenByUser}" "${scriptDir}" else - echo "Diskupdate = false, so didn't write the stage 0 loader to the MBR." + #echo "Diskupdate = false, so didn't write the stage 0 loader to the MBR." "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Stage 0 loader not written to ${targetDisk}." fi @@ -162,7 +162,8 @@ fi fi else - echo "ERROR Volume is not on a GPT partitioned disc." + #echo "ERROR Volume is not on a GPT partitioned disc." + "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "ERROR Volume is not on a GPT partitioned disc." fi Index: branches/blackosx/package/Scripts/Install/CheckPartitionScheme.sh =================================================================== --- branches/blackosx/package/Scripts/Install/CheckPartitionScheme.sh (revision 1557) +++ branches/blackosx/package/Scripts/Install/CheckPartitionScheme.sh (revision 1558) @@ -40,14 +40,14 @@ echo "${partitiontable} found." echo "-----------------------------------------------" echo "" - "$scriptDir"InstallLog.sh "${targetVolume}" "Identified ${targetDisk} is on a volume using a GPT." + "$scriptDir"InstallLog.sh "${targetVolume}" "${targetDisk} is using a GPT." exit 1 else partitiontable="GPT/MBR" echo "${partitiontable} found." echo "-----------------------------------------------" echo "" - "$scriptDir"InstallLog.sh "${targetVolume}" "Identified ${targetDisk} is on a volume using a GPT/MBR." + "$scriptDir"InstallLog.sh "${targetVolume}" "${targetDisk} is using a GPT/MBR." exit 2 fi fi @@ -56,7 +56,7 @@ echo "${partitiontable} found." echo "-----------------------------------------------" echo "" - "$scriptDir"InstallLog.sh "${targetVolume}" "Identified ${targetDisk} is on a volume using MBR." + "$scriptDir"InstallLog.sh "${targetVolume}" "${targetDisk} is using MBR." exit 3 fi Index: branches/blackosx/package/Scripts/Install/WriteChameleonStage2.sh =================================================================== --- branches/blackosx/package/Scripts/Install/WriteChameleonStage2.sh (revision 1557) +++ branches/blackosx/package/Scripts/Install/WriteChameleonStage2.sh (revision 1558) @@ -33,9 +33,6 @@ fi # check to see if install to EFI system partition was selected -# if chosen, the package installer will add a file named 'nullESP' -# in to the temporary directory /.Chameleon - if [ "${selectedDestination}" = "/Volumes/EFI" ]; then echo "DEBUG: EFI install chosen" @@ -69,12 +66,8 @@ "$scriptDir"InstallLog.sh "${targetVolume}" "Written boot to ${targetVolume}." fi - - #ÊCheck to see if the user wants to hide the boot file - #if [ -f "${selectedDestination}"/.Chameleon/nullhideboot ]; then -# # echo "Executing command: SetFile -a V ${targetVolume}/${stage2Loader}" # "${selectedDestination}"/.Chameleon//Tools/SetFile -a V "${targetVolume}"/"${stage2Loader}" #fi Index: branches/blackosx/package/Scripts/Install/CheckProceed.sh =================================================================== --- branches/blackosx/package/Scripts/Install/CheckProceed.sh (revision 1557) +++ branches/blackosx/package/Scripts/Install/CheckProceed.sh (revision 1558) @@ -60,6 +60,6 @@ echo "-----------------------------------------------" echo "" -"$scriptDir"InstallLog.sh "${installerVolume}" "CheckProceed: PASS" +#"$scriptDir"InstallLog.sh "${installerVolume}" "CheckProceed: PASS" exit 0 \ No newline at end of file Index: branches/blackosx/package/Scripts/Install/SetActivePartition.sh =================================================================== --- branches/blackosx/package/Scripts/Install/SetActivePartition.sh (revision 1557) +++ branches/blackosx/package/Scripts/Install/SetActivePartition.sh (revision 1558) @@ -4,11 +4,15 @@ echo "Set Active Partition ONLY if Windows is not installed" echo "*****************************************************" -# Receives passed values for É.. -# for example: -# efiformat code is 1 for HFS, 2 for MSDOS, 0 for unknown -# diskSigCheck code is 1 for a Windows install, 0 for no Windows install +# Sets partition active if Windows is not installed. +# Receives efiformat: code is 1 for HFS, 2 for MSDOS, 0 for unknown +# Receives diskSigCheck: code is 1 for a Windows install, 0 for no Windows install +# Receives targetDiskRaw: for example, /dev/rdisk1 +# Receives targetSlice: for example, 1 +# Receives targetVolume: Volume to install to. +# Receives scriptDir: The location of the main script dir. + if [ "$#" -eq 6 ]; then efiformat="$1" diskSigCheck="$2" @@ -28,20 +32,23 @@ exit 9 fi +partitionactive=$( fdisk -d ${targetDiskRaw} | grep -n "*" | awk -F: '{print $1}') +"$scriptDir"InstallLog.sh "${targetVolume}" "Current active partition on ${targetDiskRaw#/dev/r}: ${partitionactive}" + if [ ${diskSigCheck} == "0" ]; then - echo "DEBUG: Windows is not installed so let's change the active partition" + #echo "DEBUG: Windows is not installed so let's change the active partition" + "$scriptDir"InstallLog.sh "${targetVolume}" "Windows is not installed so let's change the active partition" - partitionactive=$( "${scriptDir}"/Tools/fdisk440 -d ${targetDiskRaw} | grep -n "*" | awk -F: '{print $1}') - echo "Current Active Partition: ${partitionactive}" - if [ "${partitionactive}" = "${targetSlice}" ]; then - echo "${targetVolume} is already flagged as active" + #echo "${targetVolume} is already flagged as active" + "$scriptDir"InstallLog.sh "${targetVolume}" "${targetVolume} is already flagged as active" else - echo "${targetVolume} is not flagged as active, so let's do it." + #echo "${targetVolume} is not flagged as active, so let's do it." + "$scriptDir"InstallLog.sh "${targetVolume}" "${targetVolume} is not flagged as active, so let's do it." # BadAxe requires EFI partition to be flagged active. # but it doesn't' hurt to do it for any non-windows partition. - "${scriptDir}"/Tools/fdisk440 -e ${targetDiskRaw} <<-MAKEACTIVE + fdisk -e ${targetDiskRaw} <<-MAKEACTIVE print flag ${targetSlice} write @@ -50,14 +57,12 @@ MAKEACTIVE fi else - echo "Windows is installed so we let that remain the active partition" + #echo "Windows is installed so we let that remain the active partition" + "$scriptDir"InstallLog.sh "${targetVolume}" "Windows is installed so that can remain the active partition" fi echo "-----------------------------------------------" echo "" echo "" -exit 0 - - - +exit 0 \ No newline at end of file Index: branches/blackosx/package/Scripts/Install/CheckGRUBLinuxLoader.sh =================================================================== --- branches/blackosx/package/Scripts/Install/CheckGRUBLinuxLoader.sh (revision 1557) +++ branches/blackosx/package/Scripts/Install/CheckGRUBLinuxLoader.sh (revision 1558) @@ -45,6 +45,6 @@ echo "-----------------------------------------------" echo "" -"$scriptDir"InstallLog.sh "${targetVolume}" "GRUB/LILO: PASS" +#"$scriptDir"InstallLog.sh "${targetVolume}" "GRUB/LILO: PASS" exit 0 \ No newline at end of file