1
0
Эх сурвалжийг харах

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

Kroese 1 жил өмнө
parent
commit
b0573664de
4 өөрчлөгдсөн 12 нэмэгдсэн , 5 устгасан
  1. 1 1
      Dockerfile
  2. 0 1
      src/define.sh
  3. 8 0
      src/install.sh
  4. 3 3
      src/samba.sh

+ 1 - 1
Dockerfile

@@ -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"

+ 0 - 1
src/define.sh

@@ -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

+ 8 - 0
src/install.sh

@@ -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

+ 3 - 3
src/samba.sh

@@ -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