feat: Display wait message (#37)

dockur · Jan 16, 2024 · 27bb072 · 27bb072
1 parent 3516206
commit 27bb072
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/entry.sh b/src/entry.sh
@@ -7,9 +7,6 @@ echo "❯ For support visit https://github.com/dockur/windows"
 export DISPLAY=web
 export BOOT_MODE=windows
 
-ln -sfn /usr/share/novnc/vnc_lite.html /usr/share/novnc/index.html
-websockify -D --web /usr/share/novnc/ 8006 localhost:5900 2>/dev/null
-
 cd /run
 
 . reset.sh      # Initialize system
@@ -23,8 +20,12 @@ cd /run
 
 trap - ERR
 
-mkdir -p /tmp/emulated_tpm
-swtpm socket -t -d --tpmstate dir=/tmp/emulated_tpm --ctrl type=unixio,path=/tmp/emulated_tpm/swtpm-sock --log level=1 --tpm2
+ln -sfn /usr/share/novnc/vnc_lite.html /usr/share/novnc/index.html
+websockify -D --web /usr/share/novnc/ 8006 localhost:5900 2>/dev/null
+
+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..."
 

diff --git a/src/install.sh b/src/install.sh
@@ -4,7 +4,11 @@ set -Eeuo pipefail
 : "${ATTENDED:="N"}"
 : "${VERSION:="win11x64"}"
 
-ARGUMENTS="-chardev socket,id=chrtpm,path=/tmp/emulated_tpm/swtpm-sock $ARGUMENTS"
+# Display wait message
+MSG="Please wait while Windows is being downloaded..."
+/run/server.sh "Windows" "$MSG" &
+
+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"
 
 BASE="$VERSION.iso"