From 5af4c1f66d783e9169c78762509780bb02739d35 Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 29 Jan 2024 08:47:42 +0100 Subject: [PATCH 1/5] Update install.sh --- src/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.sh b/src/install.sh index d9d8a0a2b..ee8b7d2d1 100644 --- a/src/install.sh +++ b/src/install.sh @@ -454,7 +454,7 @@ detectImage() { dsc=$(printVersion "$DETECTED") [ -z "$dsc" ] && dsc="$DETECTED" - warn "got $desc, but no matching XML file exists, $FB." + warn "got $dsc, but no matching XML file exists, $FB." return 0 fi From 0a4b551317acb90b012b14f6ca012444e37dbf0f Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 29 Jan 2024 08:51:04 +0100 Subject: [PATCH 2/5] Update install.sh --- src/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.sh b/src/install.sh index ee8b7d2d1..19f99c9f9 100644 --- a/src/install.sh +++ b/src/install.sh @@ -508,7 +508,7 @@ prepareImage() { local iso="$1" local dir="$2" - if [[ "${BOOT_MODE,,}" == "windows" ]]; then + if [[ "${BOOT_MODE,,}" == "windows" ]] && [[ "${DETECTED,,}" != "win2008"* ]]; then if [[ "${DETECTED,,}" != "win7x64"* ]] && [[ "${DETECTED,,}" != "winvistax64"* ]]; then if [ -f "$dir/$ETFS" ] && [ -f "$dir/$EFISYS" ]; then From 66ee7e524956002e115d6542605f5e0ae15a3f71 Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 29 Jan 2024 08:53:50 +0100 Subject: [PATCH 3/5] Create win2008r2.xml --- assets/win2008r2.xml | 288 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 288 insertions(+) create mode 100644 assets/win2008r2.xml diff --git a/assets/win2008r2.xml b/assets/win2008r2.xml new file mode 100644 index 000000000..1b9ba61d8 --- /dev/null +++ b/assets/win2008r2.xml @@ -0,0 +1,288 @@ + + + + + + en-US + + 0409:00000409 + en-US + en-US + en-US + + + + OnError + + 0 + true + + + 1 + Primary + 100 + + + 2 + Primary + true + + + + + NTFS + + 1 + true + 1 + 0x27 + + + true + NTFS + + C + 2 + 2 + + + + + + + + + 2 + /IMAGE/INDEX + + + + 0 + 2 + + false + + + + true + Never + + + false + Never + + + true + Docker + Windows for Docker + + + false + + false + + + + + + D:\viostor\w7\amd64 + + + D:\NetKVM\w7\amd64 + + + D:\Balloon\w7\amd64 + + + D:\pvpanic\w7\amd64 + + + D:\qemupciserial\w7\amd64 + + + D:\qxldod\w7\amd64 + + + D:\vioinput\w7\amd64 + + + D:\viorng\w7\amd64 + + + D:\vioscsi\w7\amd64 + + + D:\vioserial\w7\amd64 + + + + + + + false + + + + + true + + + 1 + + + + + true + + + * + + Dockur + Windows for Docker + + + + 1 + + + true + true + https://google.com + about:blank + + + true + true + https://google.com + about:blank + + + 0 + + + 1 + + + 0409:00000409 + en-US + en-US + en-US + + + false + + + 0 + + + + + true + Remote Desktop + all + + + + + + + + + + Docker + Administrators + + + true</PlainText> + </Password> + </LocalAccount> + </LocalAccounts> + <AdministratorPassword> + <Value>password</Value> + <PlainText>true</PlainText> + </AdministratorPassword> + </UserAccounts> + <AutoLogon> + <Username>Docker</Username> + <Enabled>true</Enabled> + <LogonCount>1</LogonCount> + <Password> + <Value /> + <PlainText>true</PlainText> + </Password> + </AutoLogon> + <OOBE> + <HideEULAPage>true</HideEULAPage> + <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE> + <NetworkLocation>Other</NetworkLocation> + <ProtectYourPC>3</ProtectYourPC> + <SkipUserOOBE>true</SkipUserOOBE> + <SkipMachineOOBE>true</SkipMachineOOBE> + </OOBE> + <RegisteredOrganization>Dockur</RegisteredOrganization> + <RegisteredOwner>Windows for Docker</RegisteredOwner> + <FirstLogonCommands> + <SynchronousCommand wcm:action="add"> + <Order>1</Order> + <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v AutoLogonCount /t REG_DWORD /d 0 /f</CommandLine> + <Description>Set AutoLogonCount to 0</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>2</Order> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Lsa" /v LimitBlankPasswordUse /t REG_DWORD /d 0 /f</CommandLine> + <Description>Allow RDP login with blank password</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>3</Order> + <CommandLine>cmd /C wmic useraccount where name="Docker" set PasswordExpires=false</CommandLine> + <Description>Password Never Expires</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>4</Order> + <CommandLine>cmd /C POWERCFG -H OFF</CommandLine> + <Description>Disable Hibernation</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</Order> + <CommandLine>cmd /C POWERCFG -X -monitor-timeout-ac 0</CommandLine> + <Description>Disable monitor blanking</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine> + <Description>Disable Network Discovery popup</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>7</Order> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NetworkLocationWizard" /v "HideWizard" /t REG_DWORD /d 1 /f</CommandLine> + <Description>Disable Network Discovery popup</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</Order> + <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Edge" /v "HideFirstRunExperience" /t REG_DWORD /d 1 /f</CommandLine> + <Description>Disable first-run experience in Edge</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>9</Order> + <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "HideFileExt" /t REG_DWORD /d 0 /f</CommandLine> + <Description>Show file extensions in Explorer</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>10</Order> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateFileSizePercent" /t REG_DWORD /d 0 /f</CommandLine> + <Description>Zero Hibernation File</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>11</Order> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> + <Description>Disable Hibernation Mode</Description> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>12</Order> + <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\NetworkList\NewNetworks" /v NetworkList /t REG_MULTI_SZ /d "" /f</CommandLine> + <Description>Disable Network Discovery popup</Description> + </SynchronousCommand> + </FirstLogonCommands> + </component> + </settings> +</unattend> From 809915bb9ff0357579925c95b4540851fe681ca0 Mon Sep 17 00:00:00 2001 From: Kroese <kroese@users.noreply.github.com> Date: Mon, 29 Jan 2024 08:58:39 +0100 Subject: [PATCH 4/5] Update win2008r2.xml --- assets/win2008r2.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/assets/win2008r2.xml b/assets/win2008r2.xml index 1b9ba61d8..921be8c7f 100644 --- a/assets/win2008r2.xml +++ b/assets/win2008r2.xml @@ -52,7 +52,7 @@ <OSImage> <InstallFrom> <MetaData wcm:action="add"> - <Value>2</Value> + <Value>1</Value> <Key>/IMAGE/INDEX</Key> </MetaData> </InstallFrom> @@ -85,34 +85,34 @@ <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <DriverPaths> <PathAndCredentials wcm:action="add" wcm:keyValue="1"> - <Path>D:\viostor\w7\amd64</Path> + <Path>D:\viostor\2k8R2\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="2"> - <Path>D:\NetKVM\w7\amd64</Path> + <Path>D:\NetKVM\2k8R2\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="3"> - <Path>D:\Balloon\w7\amd64</Path> + <Path>D:\Balloon\2k8R2\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="4"> - <Path>D:\pvpanic\w7\amd64</Path> + <Path>D:\pvpanic\2k8R2\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="5"> - <Path>D:\qemupciserial\w7\amd64</Path> + <Path>D:\qemupciserial\2k8R2\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="6"> - <Path>D:\qxldod\w7\amd64</Path> + <Path>D:\qxldod\2k8R2\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="7"> - <Path>D:\vioinput\w7\amd64</Path> + <Path>D:\vioinput\2k8R2\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="8"> - <Path>D:\viorng\w7\amd64</Path> + <Path>D:\viorng\2k8R2\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="9"> - <Path>D:\vioscsi\w7\amd64</Path> + <Path>D:\vioscsi\2k8R2\amd64</Path> </PathAndCredentials> <PathAndCredentials wcm:action="add" wcm:keyValue="10"> - <Path>D:\vioserial\w7\amd64</Path> + <Path>D:\vioserial\2k8R2\amd64</Path> </PathAndCredentials> </DriverPaths> </component> From 7c91d2cc916e9cf10aee10843cc33782612b0aed Mon Sep 17 00:00:00 2001 From: Kroese <kroese@users.noreply.github.com> Date: Mon, 29 Jan 2024 09:06:30 +0100 Subject: [PATCH 5/5] Update readme.md --- readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 7ae53bc1e..d66c058de 100644 --- a/readme.md +++ b/readme.md @@ -83,7 +83,8 @@ docker run -it --rm -p 8006:8006 --device=/dev/kvm --cap-add NET_ADMIN --stop-ti | `win22` | Windows Server 2022 | Microsoft | Fast | 4.7 GB | | `win19` | Windows Server 2019 | Microsoft | Fast | 5.3 GB | | `win16` | Windows Server 2016 | Microsoft | Fast | 6.5 GB | - | `w12r2` | Windows Server 2012 | Microsoft | Fast | 4.3 GB | + | `2012` | Windows Server 2012 R2| Microsoft | Fast | 4.3 GB | + | `2008` | Windows Server 2008 R2 | Microsoft | Fast | 3.0 GB | |||||| | `core11` | Tiny 11 Core | Archive.org | Slow | 2.1 GB | | `tiny11` | Tiny 11 | Archive.org | Slow | 3.8 GB |