Merge pull request #28 from hugueslarrive/main

- A small optimization for creating recovery images
- A bug fix when using the script with running LXC containers
- And the addition of features for customizing Opencore's configuration (Option 205 in osx-setup menu)
This commit is contained in:
Gabriel Luchina 2023-02-06 14:05:59 -03:00 committed by GitHub
commit e7d5d1b6b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

150
setup
View File

@ -184,6 +184,7 @@ do
echo " 202 - Clear ALL macOS Recovery Images"
echo " 203 - Remove Proxmox Subscription Notice"
echo " 204 - Enable macOS in Cloud (VultR Provider)"
echo " 205 - Customize Opencore config.plist"
echo " "
echo " 0 - Quit (or press ENTER only)"
echo " "
@ -269,11 +270,11 @@ do
if [ ! -e ${ISODIR}/recovery-highsierra.iso ]
then
dd if=/dev/zero of=${TMPDIR}/recovery-highsierra.iso bs=1M count=800 > ${LOGFILE} 2>> ${LOGFILE}
fallocate -l 800M ${TMPDIR}/recovery-highsierra.iso > ${LOGFILE} 2>> ${LOGFILE}
mkfs.msdos -F 32 ${TMPDIR}/recovery-highsierra.iso -n HIGHSIERRA >> ${LOGFILE} 2>> ${LOGFILE}
losetup /dev/loop0 ${TMPDIR}/recovery-highsierra.iso >> ${LOGFILE} 2>> ${LOGFILE}
LOOPDEV=`losetup -f --show ${TMPDIR}/recovery-highsierra.iso 2>> ${LOGFILE}`
mkdir -p /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
mount /dev/loop0 /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
mount ${LOOPDEV} /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
cd /mnt/APPLE/ >> ${LOGFILE} 2>> ${LOGFILE}
@ -283,7 +284,7 @@ do
umount /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
rmdir /mnt/APPLE
losetup -d /dev/loop0 >> ${LOGFILE} 2>> ${LOGFILE}
losetup -d ${LOOPDEV} >> ${LOGFILE} 2>> ${LOGFILE}
mv ${TMPDIR}/recovery-highsierra.iso ${ISODIR}
@ -459,11 +460,11 @@ do
if [ ! -e ${ISODIR}/recovery-mojave.iso ]
then
dd if=/dev/zero of=${TMPDIR}/recovery-mojave.iso bs=1M count=800 > ${LOGFILE} 2>> ${LOGFILE}
fallocate -l 800M ${TMPDIR}/recovery-mojave.iso > ${LOGFILE} 2>> ${LOGFILE}
mkfs.msdos -F 32 ${TMPDIR}/recovery-mojave.iso -n MOJAVE >> ${LOGFILE} 2>> ${LOGFILE}
losetup /dev/loop0 ${TMPDIR}/recovery-mojave.iso >> ${LOGFILE} 2>> ${LOGFILE}
LOOPDEV=`losetup -f --show ${TMPDIR}/recovery-mojave.iso 2>> ${LOGFILE}`
mkdir -p /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
mount /dev/loop0 /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
mount ${LOOPDEV} /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
cd /mnt/APPLE/ >> ${LOGFILE} 2>> ${LOGFILE}
@ -473,7 +474,7 @@ do
umount /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
rmdir /mnt/APPLE
losetup -d /dev/loop0 >> ${LOGFILE} 2>> ${LOGFILE}
losetup -d ${LOOPDEV} >> ${LOGFILE} 2>> ${LOGFILE}
mv ${TMPDIR}/recovery-mojave.iso ${ISODIR}
@ -649,11 +650,11 @@ do
if [ ! -e ${ISODIR}/recovery-catalina.iso ]
then
dd if=/dev/zero of=${TMPDIR}/recovery-catalina.iso bs=1M count=800 > ${LOGFILE} 2>> ${LOGFILE}
fallocate -l 800M ${TMPDIR}/recovery-catalina.iso > ${LOGFILE} 2>> ${LOGFILE}
mkfs.msdos -F 32 ${TMPDIR}/recovery-catalina.iso -n CATALINA >> ${LOGFILE} 2>> ${LOGFILE}
losetup /dev/loop0 ${TMPDIR}/recovery-catalina.iso >> ${LOGFILE} 2>> ${LOGFILE}
LOOPDEV=`losetup -f --show ${TMPDIR}/recovery-catalina.iso 2>> ${LOGFILE}`
mkdir -p /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
mount /dev/loop0 /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
mount ${LOOPDEV} /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
cd /mnt/APPLE/ >> ${LOGFILE} 2>> ${LOGFILE}
@ -663,7 +664,7 @@ do
umount /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
rmdir /mnt/APPLE
losetup -d /dev/loop0 >> ${LOGFILE} 2>> ${LOGFILE}
losetup -d ${LOOPDEV} >> ${LOGFILE} 2>> ${LOGFILE}
mv ${TMPDIR}/recovery-catalina.iso ${ISODIR}
@ -839,11 +840,11 @@ do
if [ ! -e ${ISODIR}/recovery-bigsur.iso ]
then
dd if=/dev/zero of=${TMPDIR}/recovery-bigsur.iso bs=1M count=800 > ${LOGFILE} 2>> ${LOGFILE}
fallocate -l 800M ${TMPDIR}/recovery-bigsur.iso > ${LOGFILE} 2>> ${LOGFILE}
mkfs.msdos -F 32 ${TMPDIR}/recovery-bigsur.iso -n BIGSUR >> ${LOGFILE} 2>> ${LOGFILE}
losetup /dev/loop0 ${TMPDIR}/recovery-bigsur.iso >> ${LOGFILE} 2>> ${LOGFILE}
LOOPDEV=`losetup -f --show ${TMPDIR}/recovery-bigsur.iso 2>> ${LOGFILE}`
mkdir -p /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
mount /dev/loop0 /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
mount ${LOOPDEV} /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
cd /mnt/APPLE/ >> ${LOGFILE} 2>> ${LOGFILE}
@ -853,7 +854,7 @@ do
umount /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
rmdir /mnt/APPLE
losetup -d /dev/loop0 >> ${LOGFILE} 2>> ${LOGFILE}
losetup -d ${LOOPDEV} >> ${LOGFILE} 2>> ${LOGFILE}
mv ${TMPDIR}/recovery-bigsur.iso ${ISODIR}
@ -1029,11 +1030,11 @@ do
if [ ! -e ${ISODIR}/recovery-monterey.iso ]
then
dd if=/dev/zero of=${TMPDIR}/recovery-monterey.iso bs=1M count=800 > ${LOGFILE} 2>> ${LOGFILE}
fallocate -l 800M ${TMPDIR}/recovery-monterey.iso > ${LOGFILE} 2>> ${LOGFILE}
mkfs.msdos -F 32 ${TMPDIR}/recovery-monterey.iso -n MONTEREY >> ${LOGFILE} 2>> ${LOGFILE}
losetup /dev/loop0 ${TMPDIR}/recovery-monterey.iso >> ${LOGFILE} 2>> ${LOGFILE}
LOOPDEV=`losetup -f --show ${TMPDIR}/recovery-monterey.iso 2>> ${LOGFILE}`
mkdir -p /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
mount /dev/loop0 /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
mount ${LOOPDEV} /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
cd /mnt/APPLE/ >> ${LOGFILE} 2>> ${LOGFILE}
@ -1043,7 +1044,7 @@ do
umount /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
rmdir /mnt/APPLE
losetup -d /dev/loop0 >> ${LOGFILE} 2>> ${LOGFILE}
losetup -d ${LOOPDEV} >> ${LOGFILE} 2>> ${LOGFILE}
mv ${TMPDIR}/recovery-monterey.iso ${ISODIR}
@ -1219,11 +1220,11 @@ do
if [ ! -e ${ISODIR}/recovery-ventura.iso ]
then
dd if=/dev/zero of=${TMPDIR}/recovery-ventura.iso bs=1M count=800 > ${LOGFILE} 2>> ${LOGFILE}
fallocate -l 800M ${TMPDIR}/recovery-ventura.iso > ${LOGFILE} 2>> ${LOGFILE}
mkfs.msdos -F 32 ${TMPDIR}/recovery-ventura.iso -n VENTURA >> ${LOGFILE} 2>> ${LOGFILE}
losetup /dev/loop0 ${TMPDIR}/recovery-ventura.iso >> ${LOGFILE} 2>> ${LOGFILE}
LOOPDEV=`losetup -f --show ${TMPDIR}/recovery-ventura.iso 2>> ${LOGFILE}`
mkdir -p /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
mount /dev/loop0 /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
mount ${LOOPDEV} /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
cd /mnt/APPLE/ >> ${LOGFILE} 2>> ${LOGFILE}
@ -1233,7 +1234,7 @@ do
umount /mnt/APPLE >> ${LOGFILE} 2>> ${LOGFILE}
rmdir /mnt/APPLE
losetup -d /dev/loop0 >> ${LOGFILE} 2>> ${LOGFILE}
losetup -d ${LOOPDEV} >> ${LOGFILE} 2>> ${LOGFILE}
mv ${TMPDIR}/recovery-ventura.iso ${ISODIR}
@ -1515,6 +1516,107 @@ do
fi
################################################################################################################################################################################################
################################################################################################################################################################################################
################################################################################################################################################################################################
################################################################################################################################################################################################
################################################################################################################################################################################################
################################################################################################################################################################################################
## Customize Opencore config.plist
if [ ${OPT} -eq 205 ]
then
clear
LOGFILE=${LOGDIR}/custom-oc-config.plist.log
echo " "
echo "Customize Opencore config.plist"
echo " "
LOOPDEV=`losetup -f --show -P ${ISODIR}/opencore-osx-proxmox-vm.iso 2>> ${LOGFILE}`
mkdir -p /mnt/opencore > ${LOGFILE} 2>> ${LOGFILE}
mount ${LOOPDEV}p1 /mnt/opencore >> ${LOGFILE} 2>> ${LOGFILE}
if [ ! -e /mnt/opencore/EFI/OC/config.plist.backup ]
then
cp -v /mnt/opencore/EFI/OC/config.plist /mnt/opencore/EFI/OC/config.plist.backup >> ${LOGFILE} 2>> ${LOGFILE}
fi
PREV_LANG=`grep -E '..-..:0' /mnt/opencore/EFI/OC/config.plist | sed -e 's/.*\(..-..\).*/\1/'`
BOOT_ARGS=`grep '<key>boot-args' /mnt/opencore/EFI/OC/config.plist -A1 | tail -n1 | sed -e 's/.*>\(.*\)<.*/\1/'`
TIMEOUT=`grep -A1 '>Timeout<' /mnt/opencore/EFI/OC/config.plist | tail -n1 | sed -e 's/.*>\(.*\)<.*/\1/'`
echo " "
echo -n "Enter language-country code [or ENTER to keep the current one (${PREV_LANG})]: "
read NEW_PREV_LANG
if [ -z ${NEW_PREV_LANG} ]; then NEW_PREV_LANG=${PREV_LANG}; fi;
sed -i -e "s/..-..:0/${NEW_PREV_LANG}:0/" /mnt/opencore/EFI/OC/config.plist >> ${LOGFILE} 2>> ${LOGFILE}
echo " "
echo -n "Enter boot-args [or ENTER to keep the current one (${BOOT_ARGS})]: "
read NEW_BOOT_ARGS
if [ -z "${NEW_BOOT_ARGS}" ]; then NEW_BOOT_ARGS=${BOOT_ARGS}; fi;
sed -i -e "s/${BOOT_ARGS}/${NEW_BOOT_ARGS}/" /mnt/opencore/EFI/OC/config.plist >> ${LOGFILE} 2>> ${LOGFILE}
echo " "
echo -n "Remove csr-active-config (unlock SIP configuration) [Y/N] [or ENTER for Default: N]: "
read RM_CSR_LOCK
if [ -z ${RM_CSR_LOCK} ]; then RM_CSR_LOCK="N"; fi;
if [ "${RM_CSR_LOCK}" == "Y" ] || [ "${RM_CSR_LOCK}" == "y" ]
then
echo "--- a/mnt/opencore/EFI/OC/config.plist 2023-01-25 22:43:16.000000000 +0100
+++ b/mnt/opencore/EFI/OC/config.plist 2023-01-25 22:45:24.000000000 +0100
@@ -450,2 +450,0 @@
- <key>csr-active-config</key>
- <data>AAAAAA==</data>
" > ${TMPDIR}/rm-csr-lock.patch
cd /
patch -p1 < /root/OSX-PROXMOX/tmp/rm-csr-lock.patch >> ${LOGFILE} 2>> ${LOGFILE}
cd ${SCRIPT_DIR}
rm -f ${TMPDIR}/rm-csr-lock.patch
echo "Now you can use \`csrutil disable\` and \`csrutil authenticated-root disable\` in Recovery OS to disable SIP!"
fi
echo " "
echo -n "Enter timeout [or ENTER to keep the current one (${TIMEOUT} seconds)]: "
read NEW_TIMEOUT
if [ -z ${NEW_TIMEOUT} ]; then NEW_TIMEOUT=${TIMEOUT}; fi;
if [ ${NEW_TIMEOUT} -ne ${TIMEOUT} ]
then
echo "--- a/mnt/opencore/EFI/OC/config.plist 2023-01-25 22:43:16.000000000 +0100
+++ b/mnt/opencore/EFI/OC/config.plist 2023-01-25 22:45:24.000000000 +0100
@@ -363,7 +363,7 @@
<key>TakeoffDelay</key>
<integer>0</integer>
<key>Timeout</key>
- <integer>${TIMEOUT}</integer>
+ <integer>${NEW_TIMEOUT}</integer>
</dict>
<key>Debug</key>
<dict>
" > ${TMPDIR}/timeout.patch
cd /
patch -p1 < /root/OSX-PROXMOX/tmp/timeout.patch >> ${LOGFILE} 2>> ${LOGFILE}
cd ${SCRIPT_DIR}
rm -f ${TMPDIR}/timeout.patch
fi
diff -u --color /mnt/opencore/EFI/OC/config.plist.backup /mnt/opencore/EFI/OC/config.plist
umount /mnt/opencore >> ${LOGFILE} 2>> ${LOGFILE}
rmdir /mnt/opencore
losetup -d ${LOOPDEV} >> ${LOGFILE} 2>> ${LOGFILE}
fi
exit
################################################################################################################################################################################################
################################################################################################################################################################################################
################################################################################################################################################################################################