From a04466a704bb1f09cb04b2be87e799f4a25f4cdc Mon Sep 17 00:00:00 2001 From: sickcodes Date: Tue, 30 Nov 2021 17:39:30 +0000 Subject: Add default BASESYSTEM_FORMAT variables --- Dockerfile.naked | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Dockerfile.naked') diff --git a/Dockerfile.naked b/Dockerfile.naked index 3d5e2ef..3a10efc 100644 --- a/Dockerfile.naked +++ b/Dockerfile.naked @@ -182,7 +182,7 @@ RUN touch Launch.sh \ && tee -a Launch.sh <<< '-drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file=${BOOTDISK:-/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2} \' \ && tee -a Launch.sh <<< '-device ide-hd,bus=sata.2,drive=OpenCoreBoot \' \ && tee -a Launch.sh <<< '-device ide-hd,bus=sata.3,drive=InstallMedia \' \ - && tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=/home/arch/OSX-KVM/BaseSystem.img,format=${BASESYSTEM_FORMAT} \' \ + && tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=/home/arch/OSX-KVM/BaseSystem.img,format=${BASESYSTEM_FORMAT:-qcow2} \' \ && tee -a Launch.sh <<< '-drive id=MacHDD,if=none,file=${IMAGE_PATH:-/home/arch/OSX-KVM/mac_hdd_ng.img},format=${IMAGE_FORMAT:-qcow2} \' \ && tee -a Launch.sh <<< '-device ide-hd,bus=sata.4,drive=MacHDD \' \ && tee -a Launch.sh <<< '-netdev user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900,${ADDITIONAL_PORTS} \' \ @@ -299,6 +299,11 @@ RUN ln -s /home/arch/OSX-KVM/OpenCore /home/arch/OSX-KVM/OpenCore-Catalina || tr # for example, -e ADDITIONAL_PORTS=hostfwd=tcp::23-:23, ENV ADDITIONAL_PORTS= +# since the Makefile uses raw, and raw uses the full disk amount +# we want to use a compressed qcow2 +# ENV BASESYSTEM_FORMAT=raw +ENV BASESYSTEM_FORMAT=qcow2 + # add additional QEMU boot arguments ENV BOOT_ARGS= -- cgit v1.2.3