Index: trunk/package/Scripts/Standard/postinstall
===================================================================
--- trunk/package/Scripts/Standard/postinstall (revision 1498)
+++ trunk/package/Scripts/Standard/postinstall (revision 1499)
@@ -231,7 +231,7 @@
echo "*************************************"
if [ "$( fstyp ${bootdev} | grep hfs )" ]; then
- echo "${bootdev} is a currently formatted as HFS"
+ echo "${bootdev} is currently formatted as HFS"
efiformat="hfs"
fi
if [ "$( fstyp ${bootdev} | grep msdos )" ]; then
@@ -287,18 +287,18 @@
echo "Diskupdate = true, so yes"
#---------------------------------------------------------------------
# Check bytes 438-446 of the GPTdiskProtectiveMBR for a Windows Disk Signature
- # If thereีs no Windows disk signature then we can write boot0
+ # If there's no Windows disk signature then we can write boot0
#---------------------------------------------------------------------
if [ ${disksignature} == "00000000" ]; then
echo "Executing command: fdisk440 -u -f /usr/standalone/i386/${diskloader} -y ${bootdisk}"
- fdisk440 -u -f "${bootvolume}/usr/standalone/i386/${diskloader}" -y ${bootdisk}
+ "${bootresources}/Tools/fdisk440" -u -f "${bootvolume}/usr/standalone/i386/${diskloader}" -y ${bootdisk}
else
#---------------------------------------------------------------------
# If it exists then Windows is also installed on the HDD and we need to write boot0hfs
#---------------------------------------------------------------------
echo "Executing command: fdisk440 -u -f /usr/standalone/i386/${diskloaderdualboot} -y ${bootdisk}"
- fdisk440 -u -f "${bootvolume}/usr/standalone/i386/${diskloaderdualboot}" -y ${bootdisk}
+ "${bootresources}/Tools/fdisk440" -u -f "${bootvolume}/usr/standalone/i386/${diskloaderdualboot}" -y ${bootdisk}
fi
else
echo "Diskupdate is false, so no stage 0 file was written"
@@ -332,7 +332,7 @@
if [ ${disksignature} == "00000000" ]; then
# echo "Windows is not installed so let's change the active partition"
- partitionactive=$( fdisk440 -d ${bootrdisk} | grep -n "*" | awk -F: '{print $1}')
+ partitionactive=$( "${bootresources}/Tools/fdisk440" -d ${bootrdisk} | grep -n "*" | awk -F: '{print $1}')
echo "Current Active Partition: ${partitionactive}"
if [ "${partitionactive}" = "${bootslice}" ]; then
@@ -342,7 +342,7 @@
# BadAxe requires EFI partition to be flagged active.
# but it doesn't' hurt to do it for any non-windows partition.
- fdisk440 -e ${bootrdisk} <<-MAKEACTIVE
+ "${bootresources}/Tools/fdisk440" -e ${bootrdisk} <<-MAKEACTIVE
print
flag ${bootslice}
write
Index: trunk/package/Scripts/EFI/postinstall
===================================================================
--- trunk/package/Scripts/EFI/postinstall (revision 1498)
+++ trunk/package/Scripts/EFI/postinstall (revision 1499)
@@ -268,7 +268,7 @@
fi
if [ "$( fstyp ${bootdev} | grep hfs )" ]; then
- echo "${bootdev} is a currently formatted as HFS"
+ echo "${bootdev} is currently formatted as HFS"
efiformat="hfs"
fi
if [ "$( fstyp ${bootdev} | grep msdos )" ]; then
@@ -298,51 +298,60 @@
echo "Diskupdate = true, so yes"
#---------------------------------------------------------------------
# Check bytes 438-446 of the GPTdiskProtectiveMBR for a Windows Disk Signature
- # If thereีs no Windows disk signature then we can write boot0
+ # If there's no Windows disk signature then we can write boot0
#---------------------------------------------------------------------
if [ ${disksignature} == "00000000" ]; then
- echo "Executing command: fdisk -u -f ${diskloader} -y ${bootdisk}"
- fdisk -u -f "${osxvolume}/${diskloader}" -y ${bootdisk}
+ echo "Executing command: fdisk -u -f "${osxvolume}/usr/standalone/i386/${diskloader}" -y ${bootdisk}"
+ fdisk -u -f "${osxvolume}/usr/standalone/i386/${diskloader}" -y ${bootdisk}
else
#---------------------------------------------------------------------
# If it exists then Windows is also installed on the HDD and we need to write boot0hfs
#---------------------------------------------------------------------
- echo "Executing command: fdisk -u -f ${diskloader} -y ${bootdisk}"
- fdisk -u -f "${osxvolume}/${diskloader}" -y ${bootdisk}
+ #Azipkg: diskloader=boot0 ??? boot0hfs/boot0md - remenber this is for GPT!!
+ echo "Executing command: fdisk -u -f "${osxvolume}/usr/standalone/i386/${diskloader}" -y ${bootdisk}"
+ fdisk -u -f "${osxvolume}/usr/standalone/i386/${diskloader}" -y ${bootdisk}
fi
else
echo "Diskupdate is false, so no stage 0 file was written"
fi
-
#echo "Executing command: dd if=${partitionloader} of=${bootrdev}"
#dd if="${osxvolume}/${partitionloader}" of=${bootrdev}
-echo "Prepare Stage 1 loader"
-
-echo "Executing command: dd if=${bootrdev} count=1 bs=512 of=/tmp/origbs"
-dd if=${bootrdev} count=1 bs=512 of=/tmp/origbs
-
-if [ ${efiformat} = "hfs" ]; then
- echo "Executing command: cp ${osxvolume}/${partitionloaderhfs} /tmp/newbs"
- cp "${osxvolume}/${partitionloaderhfs}" /tmp/newbs
-fi
-
+# if we have an original EFI ("FAT"), copy boot1f32 to newbs
if [ ${efiformat} = "msdos" ]; then
- echo "Executing command: cp ${osxvolume}/${partitionloaderfat} /tmp/newbs"
- cp "${osxvolume}/${partitionloaderfat}" /tmp/newbs
+
+ echo "Prepare Stage 1 loader"
+ # copy partition boot sector to origbs
+ echo "Executing command: dd if=${bootrdev} count=1 bs=512 of=/tmp/origbs"
+ dd if=${bootrdev} count=1 bs=512 of=/tmp/origbs
+
+ # copy boot1f32 to newbs
+ echo "Executing command: cp "${osxvolume}/usr/standalone/i386/${partitionloaderfat}" /tmp/newbs"
+ cp "${osxvolume}/usr/standalone/i386/${partitionloaderfat}" /tmp/newbs
+
+ # "merge" origbs into newbs
+ echo "Executing command: dd if=/tmp/origbs of=/tmp/newbs skip=3 seek=3 bs=1 count=87 conv=notrunc"
+ dd if=/tmp/origbs of=/tmp/newbs skip=3 seek=3 bs=1 count=87 conv=notrunc
+
+ echo "Write Stage 1 loader"
+
+ # write newbs to the partition boot sector
+ echo "Executing command: dd if=/tmp/newbs of=${bootrdev}"
+ dd if=/tmp/newbs of=${bootrdev}
+else
+ #Azipkg: this is was failing for me, hanged at boot0: done. Got fine when i removed "bs=512 count=1" ??
+ # makes no sense but... anyway, i'd remove this!.. no need to change EFI fs if boot1f32 works fine.
+ # In fact, i'm not a fan of EFI installs so, i'd remove it all!! :)
+ echo "Write Stage 1 loader"
+
+ # just write boot1h to the partition boot sector
+ echo "Executing command: dd if="${osxvolume}/usr/standalone/i386/${partitionloaderhfs}" of=${bootrdev}"
+ dd if="${osxvolume}/usr/standalone/i386/${partitionloaderhfs}" of=${bootrdev}
fi
-echo "Executing command: dd if=/tmp/origbs of=/tmp/newbs skip=3 seek=3 bs=1 count=87 conv=notrunc"
-dd if=/tmp/origbs of=/tmp/newbs skip=3 seek=3 bs=1 count=87 conv=notrunc
-
-echo "Write Stage 1 loader"
-
-echo "Executing command: dd of=${bootrdev} count=1 bs=512 if=/tmp/newbs"
-dd if=/tmp/newbs of=${bootrdev} count=1 bs=512
-
echo "-----------------------------------------------"
echo ""
echo ""
@@ -420,8 +429,8 @@
echo "Write Stage 2 loader"
echo "********************"
-echo "Executing command: cp ${osxvolume}${filesystemloader} ${bootvolume}/boot"
-cp "${osxvolume}${filesystemloader}" "${bootvolume}/boot"
+echo "Executing command: cp "${osxvolume}/usr/standalone/i386/${filesystemloader}" ${bootvolume}/boot"
+cp "${osxvolume}/usr/standalone/i386/${filesystemloader}" "${bootvolume}/boot"
echo "boot written"
echo "-----------------------------------------------"
Index: trunk/package/Scripts/Advanced/ForceHPET/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/ForceHPET/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/ForceHPET/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if ForceHPET has been written or not
ForceHPETCheck = False
Index: trunk/package/Scripts/Advanced/EHCIacquire/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/EHCIacquire/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/EHCIacquire/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if EHCIacquire has been written or not
EHCIacquireCheck = False
Index: trunk/package/Scripts/Advanced/VBIOS/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/VBIOS/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/VBIOS/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if VBIOS has been written or not
VBIOSCheck = False
Index: trunk/package/Scripts/Advanced/GUI/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/GUI/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/GUI/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if GUI has been written or not
GUICheck = False
@@ -27,4 +31,4 @@
outfile = open(plist, "w")
outfile.write(body)
-outfile.close()
\ No newline at end of file
+outfile.close()
Index: trunk/package/Scripts/Advanced/SMBIOSdefaults/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/SMBIOSdefaults/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/SMBIOSdefaults/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if SMBIOSdefault has been written or not
SMBIOSdefaultCheck = False
Index: trunk/package/Scripts/Advanced/UseMemDetect/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/UseMemDetect/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/UseMemDetect/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if UseMemDetect has been written or not
UseMemDetectCheck = False
Index: trunk/package/Scripts/Advanced/LegacyLogo/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/LegacyLogo/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/LegacyLogo/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if LegacyLogo has been written or not
LegacyLogoCheck = False
@@ -16,7 +20,7 @@
for line in infile:
# if we finish the tags and haven't written LegacyLogo Yet
if "" in line and LegacyLogoCheck == False:
- line = " LegacyLogo\n"
+ line = " Legacy Logo\n"
line += " Yes\n"
line += "\n"
LegacyLogoCheck = True
Index: trunk/package/Scripts/Advanced/Wake/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/Wake/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/Wake/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Wake has been written or not
WakeCheck = False
Index: trunk/package/Scripts/Advanced/BootBanner/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/BootBanner/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/BootBanner/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if BootBanner has been written or not
BootBannerCheck = False
@@ -16,7 +20,7 @@
for line in infile:
# if we finish the tags and haven't written BootBanner Yet
if "" in line and BootBannerCheck == False:
- line = " BootBanner\n"
+ line = " Boot Banner\n"
line += " No\n"
line += "\n"
BootBannerCheck = True
Index: trunk/package/Scripts/Advanced/Npci/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/Npci/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/Npci/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Kernel Flags has been written or not
KernelFlagsCheck = False
Index: trunk/package/Scripts/Advanced/UHCIreset/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/UHCIreset/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/UHCIreset/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if UHCIreset has been written or not
UHCIresetCheck = False
Index: trunk/package/Scripts/Advanced/ShowInfo/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/ShowInfo/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/ShowInfo/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if ShowInfo has been written or not
ShowInfoCheck = False
@@ -27,4 +31,4 @@
outfile = open(plist, "w")
outfile.write(body)
-outfile.close()
\ No newline at end of file
+outfile.close()
Index: trunk/package/Scripts/Advanced/Wait/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/Wait/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/Wait/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Wait has been written or not
WaitCheck = False
Index: trunk/package/Scripts/Advanced/UseNvidiaROM/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/UseNvidiaROM/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/UseNvidiaROM/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if UseNvidiaROM has been written or not
UseNvidiaROMCheck = False
Index: trunk/package/Scripts/Advanced/ForceWake/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/ForceWake/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/ForceWake/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if ForceWake has been written or not
ForceWakeCheck = False
Index: trunk/package/Scripts/Advanced/UseAtiROM/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/UseAtiROM/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/UseAtiROM/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if UseAtiROM has been written or not
UseAtiROMCheck = False
Index: trunk/package/Scripts/Advanced/QuietBoot/postinstall
===================================================================
--- trunk/package/Scripts/Advanced/QuietBoot/postinstall (revision 1498)
+++ trunk/package/Scripts/Advanced/QuietBoot/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if QuietBoot has been written or not
QuietBootCheck = False
Index: trunk/package/Scripts/Post/postinstall
===================================================================
--- trunk/package/Scripts/Post/postinstall (revision 1498)
+++ trunk/package/Scripts/Post/postinstall (revision 1499)
@@ -33,8 +33,8 @@
dest_vol="$3"
fi
-# delee the temporary Chameleon folder
+# delete the temporary Chameleon folder
rm -rf "$dest_vol/tmpcham"
-echo "Done..."
\ No newline at end of file
+echo "Done..."
Index: trunk/package/Scripts/BaseOptions/GenerateCStates/postinstall
===================================================================
--- trunk/package/Scripts/BaseOptions/GenerateCStates/postinstall (revision 1498)
+++ trunk/package/Scripts/BaseOptions/GenerateCStates/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if GenerateCStates has been written or not
GenerateCStatesCheck = False
Index: trunk/package/Scripts/BaseOptions/DropSSDT/postinstall
===================================================================
--- trunk/package/Scripts/BaseOptions/DropSSDT/postinstall (revision 1498)
+++ trunk/package/Scripts/BaseOptions/DropSSDT/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if DropSSDT has been written or not
DropSSDTCheck = False
Index: trunk/package/Scripts/BaseOptions/EthernetBuiltIn/postinstall
===================================================================
--- trunk/package/Scripts/BaseOptions/EthernetBuiltIn/postinstall (revision 1498)
+++ trunk/package/Scripts/BaseOptions/EthernetBuiltIn/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if EthernetBuiltIn has been written or not
EthernetBuiltInCheck = False
Index: trunk/package/Scripts/BaseOptions/InstantMenu/postinstall
===================================================================
--- trunk/package/Scripts/BaseOptions/InstantMenu/postinstall (revision 1498)
+++ trunk/package/Scripts/BaseOptions/InstantMenu/postinstall (revision 1499)
@@ -4,10 +4,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Instant Menu has been written or not
InstantMenuCheck = False
Index: trunk/package/Scripts/BaseOptions/GraphicsEnabler/postinstall
===================================================================
--- trunk/package/Scripts/BaseOptions/GraphicsEnabler/postinstall (revision 1498)
+++ trunk/package/Scripts/BaseOptions/GraphicsEnabler/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if GraphicsEnabler has been written or not
GraphicsEnablerCheck = False
Index: trunk/package/Scripts/BaseOptions/RestartFix/postinstall
===================================================================
--- trunk/package/Scripts/BaseOptions/RestartFix/postinstall (revision 1498)
+++ trunk/package/Scripts/BaseOptions/RestartFix/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if RestartFix has been written or not
RestartFixCheck = False
Index: trunk/package/Scripts/BaseOptions/CSTUsingSystemIO/postinstall
===================================================================
--- trunk/package/Scripts/BaseOptions/CSTUsingSystemIO/postinstall (revision 1498)
+++ trunk/package/Scripts/BaseOptions/CSTUsingSystemIO/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if CSTUsingSystemIO has been written or not
CSTUsingSystemIOCheck = False
Index: trunk/package/Scripts/BaseOptions/EnableC2State/postinstall
===================================================================
--- trunk/package/Scripts/BaseOptions/EnableC2State/postinstall (revision 1498)
+++ trunk/package/Scripts/BaseOptions/EnableC2State/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if EnableC2State has been written or not
EnableC2StateCheck = False
Index: trunk/package/Scripts/BaseOptions/EnableC3State/postinstall
===================================================================
--- trunk/package/Scripts/BaseOptions/EnableC3State/postinstall (revision 1498)
+++ trunk/package/Scripts/BaseOptions/EnableC3State/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if EnableC3State has been written or not
EnableC3StateCheck = False
Index: trunk/package/Scripts/BaseOptions/arch/postinstall
===================================================================
--- trunk/package/Scripts/BaseOptions/arch/postinstall (revision 1498)
+++ trunk/package/Scripts/BaseOptions/arch/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if arch has been written or not
archCheck = False
Index: trunk/package/Scripts/BaseOptions/EnableC4State/postinstall
===================================================================
--- trunk/package/Scripts/BaseOptions/EnableC4State/postinstall (revision 1498)
+++ trunk/package/Scripts/BaseOptions/EnableC4State/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if EnableC4State has been written or not
EnableC4StateCheck = False
Index: trunk/package/Scripts/BaseOptions/GeneratePStates/postinstall
===================================================================
--- trunk/package/Scripts/BaseOptions/GeneratePStates/postinstall (revision 1498)
+++ trunk/package/Scripts/BaseOptions/GeneratePStates/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if GeneratePStates has been written or not
GeneratePStatesCheck = False
Index: trunk/package/Scripts/Resolutions/1024x768x32/postinstall
===================================================================
--- trunk/package/Scripts/Resolutions/1024x768x32/postinstall (revision 1498)
+++ trunk/package/Scripts/Resolutions/1024x768x32/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: trunk/package/Scripts/Resolutions/1024x600x32/postinstall
===================================================================
--- trunk/package/Scripts/Resolutions/1024x600x32/postinstall (revision 1498)
+++ trunk/package/Scripts/Resolutions/1024x600x32/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: trunk/package/Scripts/Resolutions/1920x1200x32/postinstall
===================================================================
--- trunk/package/Scripts/Resolutions/1920x1200x32/postinstall (revision 1498)
+++ trunk/package/Scripts/Resolutions/1920x1200x32/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: trunk/package/Scripts/Resolutions/1600x900x32/postinstall
===================================================================
--- trunk/package/Scripts/Resolutions/1600x900x32/postinstall (revision 1498)
+++ trunk/package/Scripts/Resolutions/1600x900x32/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: trunk/package/Scripts/Resolutions/1280x1024x32/postinstall
===================================================================
--- trunk/package/Scripts/Resolutions/1280x1024x32/postinstall (revision 1498)
+++ trunk/package/Scripts/Resolutions/1280x1024x32/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: trunk/package/Scripts/Resolutions/1440x900x32/postinstall
===================================================================
--- trunk/package/Scripts/Resolutions/1440x900x32/postinstall (revision 1498)
+++ trunk/package/Scripts/Resolutions/1440x900x32/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: trunk/package/Scripts/Resolutions/1280x800x32/postinstall
===================================================================
--- trunk/package/Scripts/Resolutions/1280x800x32/postinstall (revision 1498)
+++ trunk/package/Scripts/Resolutions/1280x800x32/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: trunk/package/Scripts/Resolutions/1680x1050x32/postinstall
===================================================================
--- trunk/package/Scripts/Resolutions/1680x1050x32/postinstall (revision 1498)
+++ trunk/package/Scripts/Resolutions/1680x1050x32/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: trunk/package/Scripts/Resolutions/1920x1080x32/postinstall
===================================================================
--- trunk/package/Scripts/Resolutions/1920x1080x32/postinstall (revision 1498)
+++ trunk/package/Scripts/Resolutions/1920x1080x32/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: trunk/package/Scripts/Resolutions/1280x960x32/postinstall
===================================================================
--- trunk/package/Scripts/Resolutions/1280x960x32/postinstall (revision 1498)
+++ trunk/package/Scripts/Resolutions/1280x960x32/postinstall (revision 1499)
@@ -3,10 +3,14 @@
import sys
import os
+import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
+if not os.path.exists(plist):
+ shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
+
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
Index: trunk/package/buildpkg.sh
===================================================================
--- trunk/package/buildpkg.sh (revision 1498)
+++ trunk/package/buildpkg.sh (revision 1499)
@@ -61,13 +61,6 @@
mkdir -p ${1}/Core/Root/usr/sbin
mkdir -p ${1}/Core/Root/usr/local/bin
mkdir -p ${1}/Core/Root/usr/standalone/i386
-# if [ "$(ls -A "${1%/*}/i386/modules")" ]; then
-# echo "Modules found."
-# mkdir -p ${1}/Core/Root/usr/standalone/i386/modules
-# cp -R ${1%/*}/i386/modules ${1}/Core/Root/usr/standalone/i386
-# else
-# echo "No found modules into dir module"
-# fi
ditto --noextattr --noqtn ${1%/*}/i386/boot ${1}/Core/Root/usr/standalone/i386
ditto --noextattr --noqtn ${1%/*}/i386/boot0 ${1}/Core/Root/usr/standalone/i386
ditto --noextattr --noqtn ${1%/*}/i386/boot0md ${1}/Core/Root/usr/standalone/i386
@@ -94,7 +87,8 @@
mkdir -p ${1}/Standard/Root
mkdir -p ${1}/Standard/Scripts/Tools
cp -f ${pkgroot}/Scripts/Standard/* ${1}/Standard/Scripts
- # ditto --arch i386 `which SetFile` ${1}/Standard/Scripts/Tools/SetFile
+ ditto --arch i386 `which SetFile` ${1}/Standard/Scripts/Tools/SetFile
+ ditto --noextattr --noqtn ${1%/*}/i386/fdisk440 ${1}/Standard/Scripts/Tools
echo " [BUILD] Standard "
buildpackage "${1}/Standard" "/" "${coresize}" "start_enabled=\"true\" start_selected=\"upgrade_allowed()\" selected=\"exclusive(choices['EFI']) && exclusive(choices['noboot'])\"" >/dev/null 2>&1
# End build standard package
@@ -103,7 +97,8 @@
mkdir -p ${1}/EFI/Root
mkdir -p ${1}/EFI/Scripts/Tools
cp -f ${pkgroot}/Scripts/EFI/* ${1}/EFI/Scripts
- # ditto --arch i386 `which SetFile` ${1}/EFI/Scripts/Tools/SetFile
+ ditto --arch i386 `which SetFile` ${1}/EFI/Scripts/Tools/SetFile
+ ditto --noextattr --noqtn ${1%/*}/i386/fdisk440 ${1}/Standard/Scripts/Tools
echo " [BUILD] EFI "
buildpackage "${1}/EFI" "/" "${coresize}" "start_visible=\"systemHasGPT()\" start_selected=\"false\" selected=\"exclusive(choices['Standard']) && exclusive(choices['noboot'])\"" >/dev/null 2>&1
# End build efi package
@@ -119,11 +114,7 @@
###############################
# Supported Modules #
###############################
- # AMDGraphicsEnabler.dylib #
- # ATiGraphicsEnabler.dylib #
- # IntelGraphicsEnabler.dylib #
# klibc.dylib #
- # NVIDIAGraphicsEnabler.dylib #
# Resolution.dylib #
# uClibcxx.dylib #
###############################
@@ -133,7 +124,6 @@
choices[$((choicescount++))]="\n\n"
((xmlindent++))
packagesidentity="org.chameleon.modules"
-
# -
if [ -e ${1%/*}/i386/modules/klibc.dylib ]; then
{
@@ -460,8 +450,8 @@
# ----
# ditto -xk "${pkgroot}/Icons/pkg.zip" "${pkgroot}/Icons/"
# DeRez -only icns "${pkgroot}/Icons/Icons/pkg.icns" > tempicns.rsrc
-# Rez -append tempicns.rsrc -o "${1%/*}/${packagename// /}-${version}-r${revision}.pkg"
-# SetFile -a C "${1%/*}/${packagename// /}-${version}-r${revision}.pkg"
+# Rez -append tempicns.rsrc -o "${1%/*}/$packagename-${version}-r$revision.pkg"
+# SetFile -a C "${1%/*}/$packagename-${version}-r$revision.pkg"
# rm -f tempicns.rsrc
# rm -rf "${pkgroot}/Icons/Icons"
# End