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

Update install.sh

Browse source
This commit is contained in:
Kroese 2024-05-27 22:39:06 +02:00 • committed by GitHub
parent 0508ca9bb7
commit 5171c82a11
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/install.sh
View file

@ -489,19 +489,6 @@ setXML() {
return 0 return 0
} }
skipVersion() {
local version="$1"
case "${version,,}" in
"win2k"* | "winxp"* | "win9"* )
return 0
;;
esac
return 1
}
detectImage() { detectImage() {
local dir="$1" local dir="$1"
@ -588,17 +575,19 @@ prepareImage() {
local iso="$1" local iso="$1"
local dir="$2" local dir="$2"
local missing local desc missing
desc=$(printVersion "$DETECTED" "$DETECTED")
case "${DETECTED,,}" in case "${DETECTED,,}" in
"win9"* | "win2k"* ) "win9"* | "win2k"* )
MACHINE="pc-i440fx-2.4" ;; MACHINE="pc-i440fx-2.4" ;;
"winxp"* | "winvistax86"* | "win7x86"* ) "winvistax86"* | "win7x86"* | "winxp"* | "win2003"* )
MACHINE="pc-q35-2.10" ;; MACHINE="pc-q35-2.10" ;;
esac esac
case "${DETECTED,,}" in case "${DETECTED,,}" in
"win9"* | "winxp"* | "win2k"* ) "win9"* | "win2k"* | "winxp"* | "win2003"* )
HV="N" HV="N"
BOOT_MODE="windows_legacy" ;; BOOT_MODE="windows_legacy" ;;
"winvista"* | "win7"* | "win2008"* ) "winvista"* | "win7"* | "win2008"* )
@ -606,18 +595,22 @@ prepareImage() {
esac esac
case "${DETECTED,,}" in case "${DETECTED,,}" in
"winxp"* )
DISK_TYPE="blk"
prepareXP "$iso" "$dir" && return 0
error "Failed to prepare Windows XP ISO!" && return 1 ;;
"win9"* ) "win9"* )
DISK_TYPE="auto" DISK_TYPE="auto"
prepare9x "$iso" "$dir" && return 0 prepare9x "$iso" "$dir" && return 0
error "Failed to prepare Windows 9x ISO!" && return 1 ;; error "Failed to prepare $desc ISO!" && return 1 ;;
"win2k"* ) "win2k"* )
DISK_TYPE="auto" DISK_TYPE="auto"
prepare2k "$iso" "$dir" && return 0 prepare2k "$iso" "$dir" && return 0
error "Failed to prepare Windows 2000 ISO!" && return 1 ;; error "Failed to prepare $desc ISO!" && return 1 ;;
"winxp"* )
DISK_TYPE="blk"
prepareXP "$iso" "$dir" && return 0
error "Failed to prepare $desc ISO!" && return 1 ;;
"win2003"* )
DISK_TYPE="blk"
prepare2k3 "$iso" "$dir" && return 0
error "Failed to prepare $desc ISO!" && return 1 ;;
esac esac
if [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then if [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then
@ -962,7 +955,7 @@ buildImage() {
else else
case "${DETECTED,,}" in case "${DETECTED,,}" in
"win2k"* | "winxp"* ) "win2k"* | "winxp"* | "win2003"* )
! genisoimage -o "$out" -b "$ETFS" -no-emul-boot -boot-load-seg 1984 -boot-load-size 4 -c "$cat" -iso-level 2 -J -l -D -N -joliet-long \ ! genisoimage -o "$out" -b "$ETFS" -no-emul-boot -boot-load-seg 1984 -boot-load-size 4 -c "$cat" -iso-level 2 -J -l -D -N -joliet-long \
-relaxed-filenames -V "${LABEL::30}" -quiet "$dir" 2> "$log" && failed="y" ;; -relaxed-filenames -V "${LABEL::30}" -quiet "$dir" 2> "$log" && failed="y" ;;
"win9"* ) "win9"* )