From 5a56b717c4bed72db322946845509a52537a3c00 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Thu, 18 Jan 2024 10:32:39 +0100
Subject: [PATCH] feat: Move TPM emulator (#49)

---
 Dockerfile     | 3 +--
 src/entry.sh   | 4 ----
 src/install.sh | 3 ---
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c4fdcc8..2da6365 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/*
diff --git a/src/entry.sh b/src/entry.sh
index 5117a20..9cf43cf 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
diff --git a/src/install.sh b/src/install.sh
index 7761289..9538230 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"