diff --git a/CREDITS.md b/CREDITS.md index 42154d0..7a78a67 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -76,4 +76,6 @@ This project now uses the fantastic OpenCore bootloader from the community OpenC [@a10kiloham](https://github.com/a10kiloham) - Dockerfile for :naked image with VNC support #245 -[@a10kiloham](https://github.com/a10kiloham) - Adding Bluebubbles as an example use case #250 \ No newline at end of file +[@a10kiloham](https://github.com/a10kiloham) - Adding Bluebubbles as an example use case #250 + +[@aronzvi](https://github.com/aronzvi) - Fixed Failed to boot OSX with GENERATE_UNIQUE #244 diff --git a/Dockerfile b/Dockerfile index 8221eaa..788d670 100644 --- a/Dockerfile +++ b/Dockerfile @@ -197,10 +197,12 @@ RUN if [[ "${LINUX}" == true ]]; then \ && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine." \ ; fi -RUN yes | sudo pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \ +# TEMP-FIX for file 5.40 libguestfs issue +RUN yes | pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \ && patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \ && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \ && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine." +# TEMP-FIX for file 5.40 libguestfs issue # optional --build-arg to change branches for testing ARG BRANCH=master diff --git a/Dockerfile.auto b/Dockerfile.auto index 56aba71..937bcc3 100644 --- a/Dockerfile.auto +++ b/Dockerfile.auto @@ -99,6 +99,13 @@ RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \ && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine." # TEMP-FIX for pacman issue +# TEMP-FIX for file 5.40 libguestfs issue +RUN yes | pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \ + && patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \ + && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \ + && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine." +# TEMP-FIX for file 5.40 libguestfs issue + USER arch WORKDIR /home/arch/OSX-KVM diff --git a/Dockerfile.naked b/Dockerfile.naked index afaa2bd..052029e 100644 --- a/Dockerfile.naked +++ b/Dockerfile.naked @@ -88,6 +88,13 @@ RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \ && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine." # TEMP-FIX for pacman issue +# TEMP-FIX for file 5.40 libguestfs issue +RUN yes | pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \ + && patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \ + && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \ + && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine." +# TEMP-FIX for file 5.40 libguestfs issue + USER arch WORKDIR /home/arch/OSX-KVM