Zengtudor/windows_in_docker
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2024-11-15 01:34:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kroese 2024-05-16 07:23:29 +02:00 committed by GitHub
parent fb690f2487
commit b0573664de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

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

1
src/define.sh
View File

@ -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
src/install.sh
View File

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

6
src/samba.sh
View File

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