Index: branches/ErmaC/Enoch/package/Scripts.templates/Post/postinstall
===================================================================
--- branches/ErmaC/Enoch/package/Scripts.templates/Post/postinstall	(revision 2588)
+++ branches/ErmaC/Enoch/package/Scripts.templates/Post/postinstall	(revision 2589)
@@ -56,11 +56,6 @@
 echo "Moving Extra folder to ${choicedVolume}"
 cp -R "${v_mntpt}/Extra" "${choicedVolume}"/
 
-echo "NOTE: any Themes or modules you have must be there since this now"
-echo "      is the boot partition. ACPI tables, SMBios.plist and the"
-echo "      org.chameleon.Boot.plist (with custom settings for the target"
-echo "      OSX must be in each partition that contain it.)"
-
 echo "$subLine"
 echo "Post postinstall script complete"
 echo "$mainLine"
@@ -81,6 +76,11 @@
 # copying the installer log inside the Extra folder
 if [[ $( /usr/libexec/PlistBuddy -c "Print bootloader" ${configFile} ) == "true" ]];then
     # if we have installed the bootloader, this is a new log
+    echo "NOTE: any Themes or modules you have must be there since this now"
+    echo "      is the boot partition. ACPI tables, SMBios.plist and the"
+    echo "      org.chameleon.Boot.plist (with custom settings for the target"
+    echo "      OSX must be in each partition that contain it.)"
+    echo "$mainLine"
     cat "${v_mntpt}/${logName}" > "${choicedVolume}/Extra/${logName}"
 else
     # ..otherwise adding the new log to the existing one (if exist)
Index: branches/ErmaC/Enoch/package/Scripts.templates/Pre/preinstall
===================================================================
--- branches/ErmaC/Enoch/package/Scripts.templates/Pre/preinstall	(revision 2588)
+++ branches/ErmaC/Enoch/package/Scripts.templates/Pre/preinstall	(revision 2589)
@@ -65,6 +65,9 @@
 exec > >(tee -a "${v_mntpt}/${logName}") 2>&1
 
 echo "$mainLine"
+echo "SYSTEM INFO:"
+sw_vers
+echo "$mainLine"
 echo "Pre-Install Script"
 echo "$subLine"
 
Index: branches/ErmaC/Enoch/package/Scripts/Main/ESPpostinstall
===================================================================
--- branches/ErmaC/Enoch/package/Scripts/Main/ESPpostinstall	(revision 2588)
+++ branches/ErmaC/Enoch/package/Scripts/Main/ESPpostinstall	(revision 2589)
@@ -177,17 +177,18 @@
 }
 # --------------------------------------------------------------------------------------------------------
 PARTITION_ACTIVE_IF() {
-    echo -e "${mainLine}\nSET PARTITION ACTIVE:"
-    # if Windows was detected, don't activate the partition..
-    # if the stage 0 loader is boo0hfs, don't activate the partition
-    if [ WINDOWS_EXIST = "0" ] || [ "${stage0Loader}" != "boot0hfs" ];then
-        partitionactive=$( fdisk -d ${targetDiskRaw} | grep -n "*" | awk -F: '{print $1}')
-        if [ "${partitionactive}" ] && [ "${partitionactive}" = "${targetSlice}" ]; then
-            echo "${targetDiskRaw#/dev/r}, slice "${targetSlice}" is already set active. No need to change it."
-        else
-            echo "Setting ${choicedVolume} partition active."
-            # BadAxe requires EFI partition to be flagged active.
-            # but it doesn't' hurt to do it for any non-windows partition.
+    if  [ $InstallBootloader = "1" ];then
+        echo -e "${mainLine}\nSET PARTITION ACTIVE:"
+        # if Windows was detected, don't activate the partition..
+        # if the stage 0 loader is boo0hfs, don't activate the partition
+        if [ WINDOWS_EXIST = "0" ] || [ "${stage0Loader}" != "boot0hfs" ];then
+            partitionactive=$( fdisk -d ${targetDiskRaw} | grep -n "*" | awk -F: '{print $1}')
+            if [ "${partitionactive}" ] && [ "${partitionactive}" = "${targetSlice}" ]; then
+                echo "${targetDiskRaw#/dev/r}, slice "${targetSlice}" is already set active. No need to change it."
+            else
+                echo "Setting ${choicedVolume} partition active."
+                # BadAxe requires EFI partition to be flagged active.
+                # but it doesn't' hurt to do it for any non-windows partition.
 
 # leave left aligned the follow code:
 fdisk -e ${targetDiskRaw} <<-MAKEACTIVE
@@ -197,12 +198,13 @@
 y
 quit
 MAKEACTIVE
+            fi
+        else
+            echo "Partition will not activate when Windows is detected or stage 0 is boot0hfs"
         fi
-    else
-        echo "Partition will not activate when Windows is detected or stage 0 is boot0hfs"
+        echo ""
+        echo "$mainLine"
     fi
-    echo ""
-    echo "$mainLine"
 }
 # --------------------------------------------------------------------------------------------------------
 # Writing stage 0
Index: branches/ErmaC/Enoch/package/Scripts/Main/Standardpostinstall
===================================================================
--- branches/ErmaC/Enoch/package/Scripts/Main/Standardpostinstall	(revision 2588)
+++ branches/ErmaC/Enoch/package/Scripts/Main/Standardpostinstall	(revision 2589)
@@ -177,17 +177,18 @@
 }
 # --------------------------------------------------------------------------------------------------------
 PARTITION_ACTIVE_IF() {
-    echo -e "${mainLine}\nSET PARTITION ACTIVE:"
-    # if Windows was detected, don't activate the partition..
-    # if the stage 0 loader is boo0hfs, don't activate the partition
-    if [ WINDOWS_EXIST = "0" ] || [ "${stage0Loader}" != "boot0hfs" ];then
-        partitionactive=$( fdisk -d ${targetDiskRaw} | grep -n "*" | awk -F: '{print $1}')
-        if [ "${partitionactive}" ] && [ "${partitionactive}" = "${targetSlice}" ]; then
-            echo "${targetDiskRaw#/dev/r}, slice "${targetSlice}" is already set active. No need to change it."
-        else
-            echo "Setting ${choicedVolume} partition active."
-            # BadAxe requires EFI partition to be flagged active.
-            # but it doesn't' hurt to do it for any non-windows partition.
+    if  [ $InstallBootloader = "1" ];then
+        echo -e "${mainLine}\nSET PARTITION ACTIVE:"
+        # if Windows was detected, don't activate the partition..
+        # if the stage 0 loader is boo0hfs, don't activate the partition
+        if [ WINDOWS_EXIST = "0" ] || [ "${stage0Loader}" != "boot0hfs" ];then
+            partitionactive=$( fdisk -d ${targetDiskRaw} | grep -n "*" | awk -F: '{print $1}')
+            if [ "${partitionactive}" ] && [ "${partitionactive}" = "${targetSlice}" ]; then
+                echo "${targetDiskRaw#/dev/r}, slice "${targetSlice}" is already set active. No need to change it."
+            else
+                echo "Setting ${choicedVolume} partition active."
+                # BadAxe requires EFI partition to be flagged active.
+                # but it doesn't' hurt to do it for any non-windows partition.
 
 # leave left aligned the follow code:
 fdisk -e ${targetDiskRaw} <<-MAKEACTIVE
@@ -197,12 +198,13 @@
 y
 quit
 MAKEACTIVE
+            fi
+        else
+            echo "Partition will not activate when Windows is detected or stage 0 is boot0hfs"
         fi
-    else
-        echo "Partition will not activate when Windows is detected or stage 0 is boot0hfs"
+        echo ""
+        echo "$mainLine"
     fi
-    echo ""
-    echo "$mainLine"
 }
 # --------------------------------------------------------------------------------------------------------
 # Writing stage 0