diff --git a/setup b/setup index b890ec3..15562dc 100755 --- a/setup +++ b/setup @@ -271,9 +271,9 @@ do then 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} mkdir /mnt/APPLE/com.apple.recovery.boot >> ${LOGFILE} 2>> ${LOGFILE} cd /mnt/APPLE/com.apple.recovery.boot >> ${LOGFILE} 2>> ${LOGFILE} @@ -284,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} @@ -462,9 +462,9 @@ do then 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} mkdir /mnt/APPLE/com.apple.recovery.boot >> ${LOGFILE} 2>> ${LOGFILE} cd /mnt/APPLE/com.apple.recovery.boot >> ${LOGFILE} 2>> ${LOGFILE} @@ -475,7 +475,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} @@ -653,9 +653,9 @@ do then 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} mkdir /mnt/APPLE/com.apple.recovery.boot >> ${LOGFILE} 2>> ${LOGFILE} cd /mnt/APPLE/com.apple.recovery.boot >> ${LOGFILE} 2>> ${LOGFILE} @@ -666,7 +666,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} @@ -844,9 +844,9 @@ do then 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} mkdir /mnt/APPLE/com.apple.recovery.boot >> ${LOGFILE} 2>> ${LOGFILE} cd /mnt/APPLE/com.apple.recovery.boot >> ${LOGFILE} 2>> ${LOGFILE} @@ -857,7 +857,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} @@ -1035,9 +1035,9 @@ do then 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} mkdir /mnt/APPLE/com.apple.recovery.boot >> ${LOGFILE} 2>> ${LOGFILE} cd /mnt/APPLE/com.apple.recovery.boot >> ${LOGFILE} 2>> ${LOGFILE} @@ -1048,7 +1048,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} @@ -1226,9 +1226,9 @@ do then 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} mkdir /mnt/APPLE/com.apple.recovery.boot >> ${LOGFILE} 2>> ${LOGFILE} cd /mnt/APPLE/com.apple.recovery.boot >> ${LOGFILE} 2>> ${LOGFILE} @@ -1239,7 +1239,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}