diff options
| author | sickcodes <[email protected]> | 2021-04-18 10:54:43 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-04-18 10:54:43 +0000 |
| commit | 19439bf2bda7c592098c0d4da0f74182e9713e70 (patch) | |
| tree | 3b3700db296885062c5c12bab459b866d0826d44 /Dockerfile.naked | |
| parent | Merge pull request #250 from a10kiloham/patch-1 (diff) | |
| download | docker-osx-19439bf2bda7c592098c0d4da0f74182e9713e70.tar.xz docker-osx-19439bf2bda7c592098c0d4da0f74182e9713e70.zip | |
Add LIBGUESTFS debug & trace commands, exit on fail. Update credits
Diffstat (limited to 'Dockerfile.naked')
| -rw-r--r-- | Dockerfile.naked | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Dockerfile.naked b/Dockerfile.naked index 16de510..afaa2bd 100644 --- a/Dockerfile.naked +++ b/Dockerfile.naked @@ -142,7 +142,11 @@ ENV RAM=3 ENV WIDTH=1920 ENV HEIGHT=1080 -CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \ +# libguestfs verbose +ENV LIBGUESTFS_DEBUG=1 +ENV LIBGUESTFS_TRACE=1 + +CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || 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 \ @@ -163,7 +167,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true --height "${HEIGHT:-1080}" \ --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \ --output-env "${ENV:=/env}" \ - ; } \ + || exit 1 ; } \ ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \ source "${ENV:=/env}" 2>/dev/null \ ; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \ @@ -176,5 +180,5 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true --width "${WIDTH:-1920}" \ --height "${HEIGHT:-1080}" \ --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \ - ; } \ + || exit 1 ; } \ ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh |