feat: Added support for Windows 7 x86 (#503)
This commit is contained in:
parent
fb690f2487
commit
b0573664de
|
@ -1,5 +1,5 @@
|
||||||
FROM scratch
|
FROM scratch
|
||||||
COPY --from=qemux/qemu-docker:5.03 / /
|
COPY --from=qemux/qemu-docker:5.04 / /
|
||||||
|
|
||||||
ARG VERSION_ARG="0.0"
|
ARG VERSION_ARG="0.0"
|
||||||
ARG DEBCONF_NOWARNINGS="yes"
|
ARG DEBCONF_NOWARNINGS="yes"
|
||||||
|
|
|
@ -1186,7 +1186,6 @@ prepareXP() {
|
||||||
local iso="$1"
|
local iso="$1"
|
||||||
local dir="$2"
|
local dir="$2"
|
||||||
|
|
||||||
MACHINE="pc-q35-2.10"
|
|
||||||
ETFS="[BOOT]/Boot-NoEmul.img"
|
ETFS="[BOOT]/Boot-NoEmul.img"
|
||||||
|
|
||||||
[[ "$MANUAL" == [Yy1]* ]] && return 0
|
[[ "$MANUAL" == [Yy1]* ]] && return 0
|
||||||
|
|
|
@ -810,6 +810,12 @@ prepareImage() {
|
||||||
local dir="$2"
|
local dir="$2"
|
||||||
local missing
|
local missing
|
||||||
|
|
||||||
|
case "${DETECTED,,}" in
|
||||||
|
"winxp"* | "winvistax86"* | "win7x86"* )
|
||||||
|
MACHINE="pc-q35-2.10"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
case "${DETECTED,,}" in
|
case "${DETECTED,,}" in
|
||||||
"winxp"* )
|
"winxp"* )
|
||||||
BOOT_MODE="windows_legacy"
|
BOOT_MODE="windows_legacy"
|
||||||
|
@ -847,6 +853,8 @@ updateImage() {
|
||||||
local dat="${file/.xml/.dat}"
|
local dat="${file/.xml/.dat}"
|
||||||
local desc path src loc xml index result
|
local desc path src loc xml index result
|
||||||
|
|
||||||
|
[[ "${DETECTED,,}" == "winxp"* ]] && return 0
|
||||||
|
|
||||||
if [ ! -s "$asset" ] || [ ! -f "$asset" ]; then
|
if [ ! -s "$asset" ] || [ ! -f "$asset" ]; then
|
||||||
asset=""
|
asset=""
|
||||||
if [[ "$MANUAL" != [Yy1]* ]]; then
|
if [[ "$MANUAL" != [Yy1]* ]]; then
|
||||||
|
|
|
@ -72,14 +72,14 @@ mkdir -p "$share"
|
||||||
|
|
||||||
! smbd && smbd --debug-stdout
|
! smbd && smbd --debug-stdout
|
||||||
|
|
||||||
isXP="N"
|
legacy="N"
|
||||||
|
|
||||||
if [ -f "$STORAGE/windows.old" ]; then
|
if [ -f "$STORAGE/windows.old" ]; then
|
||||||
MT=$(<"$STORAGE/windows.old")
|
MT=$(<"$STORAGE/windows.old")
|
||||||
[[ "${MT,,}" == "pc-q35-2"* ]] && isXP="Y"
|
[[ "${MT,,}" == "pc-q35-2"* ]] && legacy="Y"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$isXP" == [Yy1]* ]]; then
|
if [[ "$legacy" == [Yy1]* ]]; then
|
||||||
[[ "$DHCP" == [Yy1]* ]] && return 0
|
[[ "$DHCP" == [Yy1]* ]] && return 0
|
||||||
# Enable NetBIOS on Windows XP
|
# Enable NetBIOS on Windows XP
|
||||||
! nmbd && nmbd --debug-stdout
|
! nmbd && nmbd --debug-stdout
|
||||||
|
|
Loading…
Reference in New Issue