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

Update install.sh

Browse source
This commit is contained in:
Kroese 2024-01-26 21:18:13 +01:00 • committed by GitHub
parent cccaa03133
commit 9ea7b46926
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/install.sh
View file

@ -304,17 +304,6 @@ extractImage() {
exit 66 exit 66
fi fi
if [ ! -f "$dir/$ETFS" ] || [ ! -f "$dir/$EFISYS" ]; then
if [ ! -f "$dir/$ETFS" ]; then
warn "failed to locate file 'etfsboot.com' in ISO image, $FB"
else
warn "failed to locate file 'efisys_noprompt.bin' in ISO image, $FB"
fi
BOOT_MODE="windows_legacy"
fi
return 0 return 0
} }
@ -329,8 +318,6 @@ findVersion() {
[[ "${name,,}" == *"server 2019"* ]] && detected="win2019-eval" [[ "${name,,}" == *"server 2019"* ]] && detected="win2019-eval"
[[ "${name,,}" == *"server 2016"* ]] && detected="win2016-eval" [[ "${name,,}" == *"server 2016"* ]] && detected="win2016-eval"
[[ "${name,,}" == *"windows 7"* ]] && detected="win7x64" [[ "${name,,}" == *"windows 7"* ]] && detected="win7x64"
[[ "${name,,}" == *"windows vista"* ]] && detected="winvistax64"
[[ "${name,,}" == *"windows xp"* ]] && detected="winxpx64"
if [[ "${name,,}" == *"windows 10"* ]]; then if [[ "${name,,}" == *"windows 10"* ]]; then
if [[ "${name,,}" == *"enterprise ltsc"* ]]; then if [[ "${name,,}" == *"enterprise ltsc"* ]]; then
@ -422,7 +409,17 @@ prepareImage() {
local dir="$2" local dir="$2"
if [[ "${DETECTED,,}" != "win7x64"* ]]; then if [[ "${DETECTED,,}" != "win7x64"* ]]; then
return 0
if [ -f "$dir/$ETFS" ] && [ -f "$dir/$EFISYS" ]; then
return 0
fi
if [ ! -f "$dir/$ETFS" ]; then
warn "failed to locate file 'etfsboot.com' in ISO image, falling back to legacy boot!"
else
warn "failed to locate file 'efisys_noprompt.bin' in ISO image, falling back to legacy boot!"
fi
fi fi
ETFS="boot.img" ETFS="boot.img"