From 80ae80ae10a63bbf5b1b0918d0cab666ff88f78b Mon Sep 17 00:00:00 2001 From: Kroese Date: Sat, 27 Apr 2024 12:05:28 +0200 Subject: [PATCH] fix: Support read-only images (#432) --- .github/ISSUE_TEMPLATE/QUESTION.yml | 4 +--- src/power.sh | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/QUESTION.yml b/.github/ISSUE_TEMPLATE/QUESTION.yml index 4308c8a..a768f93 100644 --- a/.github/ISSUE_TEMPLATE/QUESTION.yml +++ b/.github/ISSUE_TEMPLATE/QUESTION.yml @@ -6,9 +6,7 @@ body: - type: markdown attributes: value: | - Have a general question about Windows for Docker? - Please do not use this form for technical issues. - And make sure to check the [FAQ](https://github.com/dockur/windows/blob/master/readme.md) first! + Please do not use this form for technical issues, and make sure to check the [FAQ](https://github.com/dockur/windows/blob/master/readme.md) first! - type: textarea id: question attributes: diff --git a/src/power.sh b/src/power.sh index cc28f8d..70e4bbf 100644 --- a/src/power.sh +++ b/src/power.sh @@ -6,13 +6,14 @@ set -Eeuo pipefail QEMU_TERM="" QEMU_PORT=7100 QEMU_TIMEOUT=110 -QEMU_PID="/run/shm/qemu.pid" -QEMU_PTY="/run/shm/qemu.pty" -QEMU_LOG="/run/shm/qemu.log" -QEMU_OUT="/run/shm/qemu.out" -QEMU_END="/run/shm/qemu.end" +QEMU_DIR="/run/shm" +QEMU_PID="$QEMU_DIR/qemu.pid" +QEMU_PTY="$QEMU_DIR/qemu.pty" +QEMU_LOG="$QEMU_DIR/qemu.log" +QEMU_OUT="$QEMU_DIR/qemu.out" +QEMU_END="$QEMU_DIR/qemu.end" -rm -f /run/shm/qemu.* +rm -f "$QEMU_DIR/qemu.*" touch "$QEMU_LOG" _trap() { @@ -68,8 +69,9 @@ finish() { if [ ! -f "$STORAGE/windows.boot" ] && [ -f "$STORAGE/$BASE" ]; then # Remove CD-ROM ISO after install if ready; then - rm -f "$STORAGE/$BASE" - touch "$STORAGE/windows.boot" + if rm -f "$STORAGE/$BASE" 2>/dev/null; then + touch "$STORAGE/windows.boot" + fi fi fi