From fc84c11c73b1fe3bed26f16acadc6ab784cf353d Mon Sep 17 00:00:00 2001 From: Matthew Farrellee Date: Tue, 19 May 2020 07:21:17 -0400 Subject: [PATCH] use qemu-img convert instead of dmg2img --- .gitmodules | 3 --- jumpstart.sh | 2 +- tools/dmg2img | Bin 31000 -> 0 bytes tools/dmg2img-src | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) delete mode 100755 tools/dmg2img delete mode 160000 tools/dmg2img-src diff --git a/.gitmodules b/.gitmodules index a21b219..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "tools/dmg2img-src"] - path = tools/dmg2img-src - url = https://github.com/foxlet/dmg2img.git diff --git a/jumpstart.sh b/jumpstart.sh index 1b8756e..ea33e0e 100755 --- a/jumpstart.sh +++ b/jumpstart.sh @@ -36,4 +36,4 @@ case $argument in ;; esac -"$TOOLS/dmg2img" "$TOOLS/FetchMacOS/BaseSystem/BaseSystem.dmg" "$PWD/BaseSystem.img" +qemu-img convert -O raw "$TOOLS/FetchMacOS/BaseSystem/BaseSystem.dmg" "$PWD/BaseSystem.img" diff --git a/tools/dmg2img b/tools/dmg2img deleted file mode 100755 index a4aac3a54bd33c34ea7086293918f5839a9d125a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31000 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