Crash_Override/windows_on_docker
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2024-11-04 20:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: Display wait message (#37)

Browse source
This commit is contained in:
Kroese 2024-01-16 19:58:55 +01:00 committed by GitHub
parent 3516206310
commit 27bb072401
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/entry.sh
View file

@ -7,9 +7,6 @@ echo "❯ For support visit https://github.com/dockur/windows"
export DISPLAY=web export DISPLAY=web
export BOOT_MODE=windows 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 cd /run
. reset.sh # Initialize system . reset.sh # Initialize system
@ -23,8 +20,12 @@ cd /run
trap - ERR trap - ERR
mkdir -p /tmp/emulated_tpm ln -sfn /usr/share/novnc/vnc_lite.html /usr/share/novnc/index.html
swtpm socket -t -d --tpmstate dir=/tmp/emulated_tpm --ctrl type=unixio,path=/tmp/emulated_tpm/swtpm-sock --log level=1 --tpm2 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..." info "Booting Windows using $VERS..."

6
src/install.sh
View file

@ -4,7 +4,11 @@ set -Eeuo pipefail
: "${ATTENDED:="N"}" : "${ATTENDED:="N"}"
: "${VERSION:="win11x64"}" : "${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" ARGUMENTS="-tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0 $ARGUMENTS"
BASE="$VERSION.iso" BASE="$VERSION.iso"