From 7a8e78519c0abb9ab3ea9c405bcbeca168de3e9a Mon Sep 17 00:00:00 2001 From: Kroese Date: Thu, 18 Jan 2024 10:10:35 +0100 Subject: [PATCH 1/3] build: Replace p7zip-full with 7zip --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c4fdcc84c..2da636501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,9 +7,8 @@ ARG DEBCONF_NONINTERACTIVE_SEEN "true" RUN apt-get update \ && apt-get --no-install-recommends -y install \ curl \ - swtpm \ + 7zip \ wimtools \ - p7zip-full \ genisoimage \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From f723174f37e442bda12038f39e77eb98256b7275 Mon Sep 17 00:00:00 2001 From: Kroese Date: Thu, 18 Jan 2024 10:11:29 +0100 Subject: [PATCH 2/3] fix: Move TPM init --- src/install.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/install.sh b/src/install.sh index 77612892f..9538230db 100644 --- a/src/install.sh +++ b/src/install.sh @@ -5,9 +5,6 @@ set -Eeuo pipefail : "${EXTERNAL:="N"}" : "${VERSION:="win11x64"}" -ARGUMENTS="-chardev socket,id=chrtpm,path=/dev/shm/emulated_tpm/swtpm-sock $ARGUMENTS" -ARGUMENTS="-tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0 $ARGUMENTS" - [[ "${VERSION,,}" == "http"* ]] && EXTERNAL="Y" [[ "${VERSION,,}" == "11" ]] && VERSION="win11x64" From 7142d64210eab63397726a682dfd0c6f46bf262b Mon Sep 17 00:00:00 2001 From: Kroese Date: Thu, 18 Jan 2024 10:12:18 +0100 Subject: [PATCH 3/3] fix: Move TPM init --- src/entry.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/entry.sh b/src/entry.sh index 5117a202f..9cf43cfe8 100644 --- a/src/entry.sh +++ b/src/entry.sh @@ -23,10 +23,6 @@ if [[ "${DISPLAY,,}" == "web" ]]; then nginx -e stderr fi -mkdir -p /dev/shm/emulated_tpm -swtpm socket -t -d --tpmstate dir=/dev/shm/emulated_tpm --ctrl \ - type=unixio,path=/dev/shm/emulated_tpm/swtpm-sock --log level=1 --tpm2 - info "Booting Windows using $VERS..." [[ "$DEBUG" == [Yy1]* ]] && set -x