Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Display wait message #37

Merged
merged 5 commits into from
Jan 16, 2024
Merged

feat: Display wait message #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eae75cd
feat: Display wait message
kroese Jan 16, 2024
2acc651
fix: Launch websockify
kroese Jan 16, 2024
8fd6826
feat: Emulate TPM in RAM
kroese Jan 16, 2024
9af0eba
feat: TPM in RAM
kroese Jan 16, 2024
0a20bd2
feat: TPM in RAM
kroese Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/entry.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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..."

Expand Down
6 changes: 5 additions & 1 deletion src/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down