sebarocks/docker-windows
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2025-10-28 11:45:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Store bootmode in file

Browse source
This commit is contained in:
Kroese 2024-04-22 14:50:09 +02:00 • committed by GitHub
parent d9f5e62513
commit 3467b5d55f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/install.sh
View file

@ -266,6 +266,7 @@ finishInstall() {
# Mark ISO as prepared via magic byte # Mark ISO as prepared via magic byte
if ! printf '\x16' | dd of="$iso" bs=1 seek=0 count=1 conv=notrunc status=none; then if ! printf '\x16' | dd of="$iso" bs=1 seek=0 count=1 conv=notrunc status=none; then
error "Failed to set magic byte!" error "Failed to set magic byte!"
return 1
fi fi
fi fi
@ -280,7 +281,10 @@ finishInstall() {
# Enable secure boot + TPM on manual installs as Win11 requires # Enable secure boot + TPM on manual installs as Win11 requires
if [[ "$MANUAL" == [Yy1]* ]] || [[ "$aborted" == [Yy1]* ]]; then if [[ "$MANUAL" == [Yy1]* ]] || [[ "$aborted" == [Yy1]* ]]; then
[[ "${DETECTED,,}" == "win11"* ]] && BOOT_MODE="windows_secure" if [[ "${DETECTED,,}" == "win11"* ]]; then
BOOT_MODE="windows_secure"
echo "$BOOT_MODE" > "$STORAGE/windows.mode"
fi
fi fi
rm -rf "$TMP" rm -rf "$TMP"
@ -292,7 +296,10 @@ abortInstall() {
local iso="$1" local iso="$1"
if [[ "$iso" != "$STORAGE/$BASE" ]]; then if [[ "$iso" != "$STORAGE/$BASE" ]]; then
mv -f "$iso" "$STORAGE/$BASE" if ! mv -f "$iso" "$STORAGE/$BASE"; then
error "Failed to move ISO: $iso"
exit 69
fi
fi fi
if ! finishInstall "$STORAGE/$BASE" "Y"; then if ! finishInstall "$STORAGE/$BASE" "Y"; then
@ -1115,6 +1122,8 @@ bootWindows() {
MACHINE=$(<"$STORAGE/windows.old") MACHINE=$(<"$STORAGE/windows.old")
[ -z "$MACHINE" ] && MACHINE="q35" [ -z "$MACHINE" ] && MACHINE="q35"
BOOT_MODE="windows_legacy" BOOT_MODE="windows_legacy"
rm -rf "$TMP"
return 0
fi fi
local creation="1.10" local creation="1.10"
@ -1136,10 +1145,13 @@ bootWindows() {
mv "$STORAGE/windows.vars" "$STORAGE/$BOOT_MODE.vars" mv "$STORAGE/windows.vars" "$STORAGE/$BOOT_MODE.vars"
fi fi
fi fi
else
if [ -s "$STORAGE/windows.mode" ] && [ -f "$STORAGE/windows.mode" ]; then
BOOT_MODE=$(<"$STORAGE/windows.mode")
fi
fi fi
rm -rf "$TMP" rm -rf "$TMP"
return 0 return 0
} }