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-26 21:27:34 +02:00 • committed by GitHub
parent f098cb16d2
commit d69389a22d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/install.sh
View file

@ -523,8 +523,9 @@ detectLegacy() {
fi fi
if [ -f "$dir/CDROM_NT.5" ]; then if [ -f "$dir/CDROM_NT.5" ]; then
desc="Windows 2000" DETECTED="win2kx86"
info "Detected: $desc" && error "$desc is not supported yet!" && exit 54 desc=$(printEdition "$DETECTED" "Windows 2000")
info "Detected: $desc" && return 0
fi fi
if [ -f "$dir/WIN51AA" ] || [ -f "$dir/WIN51AD" ] || [ -f "$dir/WIN51AS" ] || [ -f "$dir/WIN51MA" ] || [ -f "$dir/WIN51MD" ]; then if [ -f "$dir/WIN51AA" ] || [ -f "$dir/WIN51AD" ] || [ -f "$dir/WIN51AS" ] || [ -f "$dir/WIN51MA" ] || [ -f "$dir/WIN51MD" ]; then
@ -555,7 +556,7 @@ detectImage() {
if [ -n "$DETECTED" ]; then if [ -n "$DETECTED" ]; then
case "${DETECTED,,}" in case "${DETECTED,,}" in
"winxp"* | "win9"* ) "win2k"* | "winxp"* | "win9"* )
return 0 return 0
;; ;;
esac esac
@ -636,7 +637,7 @@ prepareImage() {
"win9"* ) "win9"* )
MACHINE="pc-i440fx-2.4" MACHINE="pc-i440fx-2.4"
;; ;;
"winxp"* | "winvistax86"* | "win7x86"* ) "win2k"* | "winxp"* | "winvistax86"* | "win7x86"* )
MACHINE="pc-q35-2.10" MACHINE="pc-q35-2.10"
;; ;;
esac esac
@ -656,6 +657,13 @@ prepareImage() {
prepare9x "$iso" "$dir" && return 0 prepare9x "$iso" "$dir" && return 0
error "Failed to prepare Windows 9x ISO!" && return 1 error "Failed to prepare Windows 9x ISO!" && return 1
;; ;;
"win2k"* )
HV="N"
DISK_TYPE="auto"
BOOT_MODE="windows_legacy"
prepare2k "$iso" "$dir" && return 0
error "Failed to prepare Windows 2000 ISO!" && return 1
;;
"winvista"* | "win7"* | "win2008"* ) "winvista"* | "win7"* | "win2008"* )
BOOT_MODE="windows_legacy" ;; BOOT_MODE="windows_legacy" ;;
esac esac
@ -851,7 +859,7 @@ updateImage() {
local desc path src wim xml index result local desc path src wim xml index result
case "${DETECTED,,}" in case "${DETECTED,,}" in
"winxp"* | "win9"* ) "win2k"* | "winxp"* | "win9"* )
return 0 return 0
;; ;;
esac esac
@ -1005,7 +1013,7 @@ buildImage() {
else else
case "${DETECTED,,}" in case "${DETECTED,,}" in
"winxp"* ) "win2k"* | "winxp"* )
! 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"* )