diff options
| author | sickcodes <[email protected]> | 2021-03-10 03:35:48 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-03-10 03:35:48 +0700 |
| commit | c7efa930c739da5627cd0a7e6841d153d224dc0d (patch) | |
| tree | a4b7a4dc091344b667e8f7b0d1790862a93d1807 | |
| parent | Add temporary folder for hardlinks ./custom (diff) | |
| parent | FIRST: sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" (diff) | |
| download | docker-osx-c7efa930c739da5627cd0a7e6841d153d224dc0d.tar.xz docker-osx-c7efa930c739da5627cd0a7e6841d153d224dc0d.zip | |
Merge pull request #173 from sickcodes/touch-before-chown
sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${…
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | Dockerfile.auto | 3 | ||||
| -rw-r--r-- | Dockerfile.naked | 3 | ||||
| -rw-r--r-- | custom/README.md | 1 |
4 files changed, 6 insertions, 4 deletions
@@ -295,7 +295,8 @@ VOLUME ["/tmp/.X11-unix"] # the default serial numbers are already contained in ./OpenCore-Catalina/OpenCore.qcow2 # And the default serial numbers -CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \ +CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \ + ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \ ; [[ "${NOPICKER}" == true ]] && { \ sed -i '/^.*InstallMedia.*/d' Launch.sh \ && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \ diff --git a/Dockerfile.auto b/Dockerfile.auto index 65efef8..c5d199f 100644 --- a/Dockerfile.auto +++ b/Dockerfile.auto @@ -148,7 +148,8 @@ ENV BOILERPLATE="By using this Dockerfile, you hereby agree that you are a secur CMD echo "${BOILERPLATE}" \ ; [[ "${TERMS_OF_USE}" = i_agree ]] || exit 1 \ ; echo "Disk is being copied between layers... Please wait a minute..." \ - ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \ + ; sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \ + ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \ ; [[ "${NOPICKER}" == true ]] && { \ sed -i '/^.*InstallMedia.*/d' Launch.sh \ && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \ diff --git a/Dockerfile.naked b/Dockerfile.naked index bf006d7..3df45d2 100644 --- a/Dockerfile.naked +++ b/Dockerfile.naked @@ -114,7 +114,8 @@ ENV IMAGE_PATH=/image ENV NOPICKER=true -CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \ +CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \ + ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \ ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \ nohup Xvfb :99 -screen 0 1920x1080x16 \ & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \ diff --git a/custom/README.md b/custom/README.md index 7014c1d..92bb97d 100644 --- a/custom/README.md +++ b/custom/README.md @@ -2,7 +2,6 @@ This folder has been moved to its own repository :) - This is a temporary copy for hardlinks. See [https://github.com/sickcodes/osx-serial-generator](https://github.com/sickcodes/osx-serial-generator)
\ No newline at end of file |