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: Fall back to secure boot on older installations

Browse source
This commit is contained in:
Kroese 2024-04-19 18:23:28 +02:00 • committed by GitHub
parent e8a7b2c708
commit ad5b06da59
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/install.sh
View file

@ -250,8 +250,9 @@ finishInstall() {
rm -f "$STORAGE/windows.old" rm -f "$STORAGE/windows.old"
fi fi
# Fall back to secure boot when ISO has not been modified
if [[ "$MANUAL" == [Yy1]* ]] || [[ "$aborted" == [Yy1]* ]]; then if [[ "$MANUAL" == [Yy1]* ]] || [[ "$aborted" == [Yy1]* ]]; then
[[ "${DETECTED,,}" == "win11"* ]] && TPM="Y" [[ "${DETECTED,,}" == "win11"* ]] && BOOT_MODE="windows_secure"
fi fi
rm -rf "$TMP" rm -rf "$TMP"
@ -1084,9 +1085,7 @@ buildImage() {
return 0 return 0
} }
###################################### bootWindows() {
if ! startInstall; then
if [ -f "$STORAGE/windows.old" ]; then if [ -f "$STORAGE/windows.old" ]; then
MACHINE=$(<"$STORAGE/windows.old") MACHINE=$(<"$STORAGE/windows.old")
@ -1094,7 +1093,32 @@ if ! startInstall; then
BOOT_MODE="windows_legacy" BOOT_MODE="windows_legacy"
fi fi
local creation="1.10"
local minimal="2.14"
if [ -s "$STORAGE/windows.ver" ]; then
creation=$(<"$STORAGE/windows.ver")
fi
# Fall back to secure boot on installations created prior to v2.14
if (( $(echo "$creation < $minimal" | bc -l) )); then
if [[ "${BOOT_MODE,,}" == "windows" ]] || [[ "${BOOT_MODE,,}" == "windows_plain" ]]; then
BOOT_MODE="windows_secure"
fi
fi
rm -rf "$TMP" rm -rf "$TMP"
return 0
}
######################################
if ! startInstall; then
if ! bootWindows; then
error "Failed to boot Windows!"
exit 68
fi
return 0 return 0
fi fi