Unverified Commit b0573664 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

feat: Added support for Windows 7 x86 (#503)

parent fb690f24

Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM scratch

COPY --from=qemux/qemu-docker:5.03 / /

COPY --from=qemux/qemu-docker:5.04 / /



ARG VERSION_ARG="0.0"

ARG DEBCONF_NOWARNINGS="yes"

src/define.sh

+0 −1
Original line number Diff line number Diff line
@@ -1186,7 +1186,6 @@ prepareXP() { 
  local iso="$1"

  local dir="$2"



  MACHINE="pc-q35-2.10"

  ETFS="[BOOT]/Boot-NoEmul.img"



  [[ "$MANUAL" == [Yy1]* ]] && return 0

src/install.sh

+8 −0
Original line number Diff line number Diff line
@@ -810,6 +810,12 @@ prepareImage() { 
  local dir="$2"

  local missing



  case "${DETECTED,,}" in

    "winxp"* | "winvistax86"* |  "win7x86"* )

      MACHINE="pc-q35-2.10"

      ;;

  esac



  case "${DETECTED,,}" in

    "winxp"* )

      BOOT_MODE="windows_legacy"
@@ -847,6 +853,8 @@ updateImage() { 
  local dat="${file/.xml/.dat}"

  local desc path src loc xml index result



  [[ "${DETECTED,,}" == "winxp"* ]] && return 0



  if [ ! -s "$asset" ] || [ ! -f "$asset" ]; then

    asset=""

    if [[ "$MANUAL" != [Yy1]* ]]; then

src/samba.sh

+3 −3
Original line number Diff line number Diff line
@@ -72,14 +72,14 @@ mkdir -p "$share" 


! smbd && smbd --debug-stdout



isXP="N"

legacy="N"



if [ -f "$STORAGE/windows.old" ]; then

  MT=$(<"$STORAGE/windows.old")

  [[ "${MT,,}" == "pc-q35-2"* ]] && isXP="Y"

  [[ "${MT,,}" == "pc-q35-2"* ]] && legacy="Y"

fi



if [[ "$isXP" == [Yy1]* ]]; then

if [[ "$legacy" == [Yy1]* ]]; then

  [[ "$DHCP" == [Yy1]* ]] && return 0

  # Enable NetBIOS on Windows XP

  ! nmbd && nmbd --debug-stdout