diff options
| author | sickcodes <[email protected]> | 2021-10-29 17:25:51 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-10-29 17:25:51 +0000 |
| commit | 24033387a39772a42276b922f85babd7f4d66eda (patch) | |
| tree | e0beb49a55d638a9edce82e4da2ec7c32a2db0ff /Dockerfile.auto | |
| parent | `OpenCore-Catalina/OpenCore.qcow2` was moved to `OpenCore/OpenCore.qcow2`, sy... (diff) | |
| download | docker-osx-24033387a39772a42276b922f85babd7f4d66eda.tar.xz docker-osx-24033387a39772a42276b922f85babd7f4d66eda.zip | |
Fixes #368 Downgrade kernel for the subsystem to 5.12, and hold back libguestfs at libguestfs-1.44.1libguestfs-linux-hold
Diffstat (limited to 'Dockerfile.auto')
| -rw-r--r-- | Dockerfile.auto | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/Dockerfile.auto b/Dockerfile.auto index 9629fe0..2fce725 100644 --- a/Dockerfile.auto +++ b/Dockerfile.auto @@ -92,19 +92,29 @@ USER arch ENV USER arch -# 5.13 problem -ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux -ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1 +#### libguestfs versioning + +# 5.13+ problem resolved by building the qcow2 against 5.12 using libguestfs-1.44.1-6 +ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux +ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1 ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1 +ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst +ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst + +ARG LINUX=true + +# required to use libguestfs inside a docker container, to create bootdisks for docker-osx on-the-fly +RUN if [[ "${LINUX}" == true ]]; then \ + sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm \ + ; sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \ + ; sudo libguestfs-test-tool \ + ; sudo rm -rf /var/tmp/.guestfs-* \ + ; fi + +#### -RUN sudo pacman -Rns linux --noconfirm \ - ; sudo pacman -Syy \ - ; sudo pacman -S mkinitcpio --noconfirm \ - ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \ - ; sudo rm -rf /var/tmp/.guestfs-* \ - ; libguestfs-test-tool WORKDIR /home/arch/OSX-KVM |