docs: Readme (#56 )

fix: Sanitize filename (#55 )
feat: Support more image layouts (#54 )
2026-01-13 06:32:23 +00:00 · 2024-01-19 04:31:20 +01:00 · 2024-01-19 04:28:03 +01:00 · 2024-01-19 01:25:39 +01:00 · 2024-01-18 19:11:59 +01:00 · 2024-01-18 10:32:39 +01:00
13 changed files with 427 additions and 336 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,6 +8,7 @@ on:
    paths-ignore:
      - '**/*.md'
      - '**/*.yml'
+      - '**/*.xml'
      - '.gitignore'
      - '.dockerignore'
      - '.github/**'
--- a/10
+++ b/10
@@ -7,10 +7,8 @@ ARG DEBCONF_NONINTERACTIVE_SEEN "true"
 RUN apt-get update \
    && apt-get --no-install-recommends -y install \
        curl \
-        novnc \
-        swtpm \
+        7zip \
        wimtools \
-        p7zip-full \
        genisoimage \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -19,15 +17,15 @@ COPY ./src /run/
 COPY ./assets /run/assets

 ADD https://raw.githubusercontent.com/ElliotKillick/Mido/main/Mido.sh /run/mido.sh
-ADD https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso /run/drivers.iso
+ADD https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/latest-virtio/virtio-win.iso /run/drivers.iso

 RUN chmod +x /run/*.sh

-EXPOSE 8006
+EXPOSE 8006 3389
 VOLUME /storage

-ENV CPU_CORES "2"
 ENV RAM_SIZE "4G"
+ENV CPU_CORES "2"
 ENV DISK_SIZE "64G"

 ARG VERSION_ARG "0.0"
--- a/assets/win10x64.xml
+++ b/assets/win10x64.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State">
-  <settings pass="offlineServicing"/>
  <settings pass="windowsPE">
    <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
      <SetupUILanguage>
@@ -126,6 +125,11 @@
      </DriverPaths>
    </component>
  </settings>
+  <settings pass="offlineServicing">
+    <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
+      <EnableLUA>false</EnableLUA>
+    </component>
+  </settings>
  <settings pass="generalize"/>
  <settings pass="specialize">
    <component name="Microsoft-Windows-Deployment" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
@@ -265,15 +269,21 @@
        <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>
          <RequiresUserInput>false</RequiresUserInput>
          <CommandLine>cmd /C wmic useraccount where name="Docker" set PasswordExpires=false</CommandLine>
          <Description>Password Never Expires</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>3</Order>
+          <Order>4</Order>
          <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine>
          <Description>Install VirtIO drivers</Description>
        </SynchronousCommand>
--- a/assets/win11x64.xml
+++ b/assets/win11x64.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State">
-  <settings pass="offlineServicing"/>
  <settings pass="windowsPE">
    <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
      <SetupUILanguage>
@@ -90,6 +89,24 @@
        <AcceptEula>true</AcceptEula>
      </UserData>
      <EnableFirewall>false</EnableFirewall>
+      <RunSynchronous>
+        <RunSynchronousCommand wcm:action="add">
+          <Order>1</Order>
+          <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassTPMCheck /t REG_DWORD /d 1 /f</Path>
+        </RunSynchronousCommand>
+        <RunSynchronousCommand wcm:action="add">
+          <Order>2</Order>
+          <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassSecureBootCheck /t REG_DWORD /d 1 /f</Path>
+        </RunSynchronousCommand>
+        <RunSynchronousCommand wcm:action="add">
+          <Order>3</Order>
+          <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassRAMCheck /t REG_DWORD /d 1 /f</Path>
+        </RunSynchronousCommand>
+        <RunSynchronousCommand wcm:action="add">
+          <Order>4</Order>
+          <Path>reg.exe add "HKLM\SYSTEM\Setup\MoSetup" /v AllowUpgradesWithUnsupportedTPMOrCPU /t REG_DWORD /d 1 /f</Path>
+        </RunSynchronousCommand>
+      </RunSynchronous>
    </component>
    <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
      <DriverPaths>
@@ -126,6 +143,11 @@
      </DriverPaths>
    </component>
  </settings>
+  <settings pass="offlineServicing">
+    <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
+      <EnableLUA>false</EnableLUA>
+    </component>
+  </settings>
  <settings pass="generalize"/>
  <settings pass="specialize">
    <component name="Microsoft-Windows-Deployment" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
@@ -260,20 +282,35 @@
        <ProtectYourPC>3</ProtectYourPC>
        <HideEULAPage>true</HideEULAPage>
        <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE>
+        <HideOnlineAccountScreens>true</HideOnlineAccountScreens>
      </OOBE>
      <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>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV1 /d 0 /t REG_DWORD /f</CommandLine>
+        </SynchronousCommand>
+        <SynchronousCommand wcm:action="add">
+          <Order>4</Order>
+          <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV2 /d 0 /t REG_DWORD /f</CommandLine>
+        </SynchronousCommand>
+        <SynchronousCommand wcm:action="add">
+          <Order>5</Order>
          <RequiresUserInput>false</RequiresUserInput>
          <CommandLine>cmd /C wmic useraccount where name="Docker" set PasswordExpires=false</CommandLine>
          <Description>Password Never Expires</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>3</Order>
+          <Order>6</Order>
          <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine>
          <Description>Install VirtIO drivers</Description>
        </SynchronousCommand>
--- a/assets/win2016-eval.xml
+++ b/assets/win2016-eval.xml
@@ -101,34 +101,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\2k16\amd64</Path>
+          <Path>D:\viostor\2k16\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="2">
-            <Path>D:\NetKVM\2k16\amd64</Path>
+          <Path>D:\NetKVM\2k16\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="3">
-            <Path>D:\Balloon\2k16\amd64</Path>
+          <Path>D:\Balloon\2k16\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="4">
-            <Path>D:\pvpanic\2k16\amd64</Path>
+          <Path>D:\pvpanic\2k16\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="5">
-            <Path>D:\qemupciserial\2k16\amd64</Path>
+          <Path>D:\qemupciserial\2k16\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="6">
-            <Path>D:\qxldod\2k16\amd64</Path>
+          <Path>D:\qxldod\2k16\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="7">
-            <Path>D:\vioinput\2k16\amd64</Path>
+          <Path>D:\vioinput\2k16\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="8">
-            <Path>D:\viorng\2k16\amd64</Path>
+          <Path>D:\viorng\2k16\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="9">
-            <Path>D:\vioscsi\2k16\amd64</Path>
+          <Path>D:\vioscsi\2k16\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="10">
-            <Path>D:\vioserial\2k16\amd64</Path>
+          <Path>D:\vioserial\2k16\amd64</Path>
        </PathAndCredentials>
      </DriverPaths>
    </component>
@@ -162,7 +162,7 @@
    </component>
    <component name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
      <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon>
-    </component>    
+    </component>
    <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
      <fDenyTSConnections>false</fDenyTSConnections>
    </component>
@@ -177,7 +177,7 @@
          <Profile>all</Profile>
        </FirewallGroup>
      </FirewallGroups>
-    </component>    
+    </component>
  </settings>
  <settings pass="oobeSystem">
    <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
@@ -217,21 +217,25 @@
        <SkipMachineOOBE>true</SkipMachineOOBE>
        <SkipUserOOBE>true</SkipUserOOBE>
      </OOBE>
-      <RegisteredOrganization>Organization</RegisteredOrganization>
-      <RegisteredOwner>Owner</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>
          <RequiresUserInput>false</RequiresUserInput>
          <CommandLine>cmd /C wmic useraccount where name="Docker" set PasswordExpires=false</CommandLine>
          <Description>Password Never Expires</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>3</Order>
+          <Order>4</Order>
          <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine>
          <Description>Install VirtIO drivers</Description>
        </SynchronousCommand>
--- a/assets/win2019-eval.xml
+++ b/assets/win2019-eval.xml
@@ -101,34 +101,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\2k19\amd64</Path>
+          <Path>D:\viostor\2k19\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="2">
-            <Path>D:\NetKVM\2k19\amd64</Path>
+          <Path>D:\NetKVM\2k19\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="3">
-            <Path>D:\Balloon\2k19\amd64</Path>
+          <Path>D:\Balloon\2k19\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="4">
-            <Path>D:\pvpanic\2k19\amd64</Path>
+          <Path>D:\pvpanic\2k19\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="5">
-            <Path>D:\qemupciserial\2k19\amd64</Path>
+          <Path>D:\qemupciserial\2k19\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="6">
-            <Path>D:\qxldod\2k19\amd64</Path>
+          <Path>D:\qxldod\2k19\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="7">
-            <Path>D:\vioinput\2k19\amd64</Path>
+          <Path>D:\vioinput\2k19\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="8">
-            <Path>D:\viorng\2k19\amd64</Path>
+          <Path>D:\viorng\2k19\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="9">
-            <Path>D:\vioscsi\2k19\amd64</Path>
+          <Path>D:\vioscsi\2k19\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="10">
-            <Path>D:\vioserial\2k19\amd64</Path>
+          <Path>D:\vioserial\2k19\amd64</Path>
        </PathAndCredentials>
      </DriverPaths>
    </component>
@@ -162,7 +162,7 @@
    </component>
    <component name="Microsoft-Windows-OutOfBoxExperience" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
      <DoNotOpenInitialConfigurationTasksAtLogon>true</DoNotOpenInitialConfigurationTasksAtLogon>
-    </component>    
+    </component>
    <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
      <fDenyTSConnections>false</fDenyTSConnections>
    </component>
@@ -177,7 +177,7 @@
          <Profile>all</Profile>
        </FirewallGroup>
      </FirewallGroups>
-    </component>    
+    </component>
  </settings>
  <settings pass="oobeSystem">
    <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
@@ -217,21 +217,25 @@
        <SkipMachineOOBE>true</SkipMachineOOBE>
        <SkipUserOOBE>true</SkipUserOOBE>
      </OOBE>
-      <RegisteredOrganization>Organization</RegisteredOrganization>
-      <RegisteredOwner>Owner</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>
          <RequiresUserInput>false</RequiresUserInput>
          <CommandLine>cmd /C wmic useraccount where name="Docker" set PasswordExpires=false</CommandLine>
          <Description>Password Never Expires</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>3</Order>
+          <Order>4</Order>
          <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine>
          <Description>Install VirtIO drivers</Description>
        </SynchronousCommand>
--- a/assets/win2022-eval.xml
+++ b/assets/win2022-eval.xml
@@ -217,21 +217,25 @@
        <SkipMachineOOBE>true</SkipMachineOOBE>
        <SkipUserOOBE>true</SkipUserOOBE>
      </OOBE>
-      <RegisteredOrganization>Organization</RegisteredOrganization>
-      <RegisteredOwner>Owner</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>
          <RequiresUserInput>false</RequiresUserInput>
          <CommandLine>cmd /C wmic useraccount where name="Docker" set PasswordExpires=false</CommandLine>
          <Description>Password Never Expires</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>3</Order>
+          <Order>4</Order>
          <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine>
          <Description>Install VirtIO drivers</Description>
        </SynchronousCommand>
--- a/assets/win7x64-ultimate.xml
+++ b/assets/win7x64-ultimate.xml
@@ -1,204 +0,0 @@
-<?xml version="1.0"?>
-<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State">
-  <settings pass="offlineServicing"/>
-  <settings pass="windowsPE">
-    <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-      <SetupUILanguage>
-        <UILanguage>en-US</UILanguage>
-      </SetupUILanguage>
-      <InputLocale>0409:00000409</InputLocale>
-      <SystemLocale>en-US</SystemLocale>
-      <UILanguage>en-US</UILanguage>
-      <UserLocale>en-US</UserLocale>
-    </component>
-    <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-      <DiskConfiguration>
-        <Disk wcm:action="add">
-          <DiskID>0</DiskID>
-          <WillWipeDisk>true</WillWipeDisk>
-          <CreatePartitions>
-            <!-- Windows RE Tools partition -->
-            <CreatePartition wcm:action="add">
-              <Order>1</Order>
-              <Type>Primary</Type>
-              <Size>300</Size>
-            </CreatePartition>
-            <!-- System partition (ESP) -->
-            <CreatePartition wcm:action="add">
-              <Order>2</Order>
-              <Type>EFI</Type>
-              <Size>100</Size>
-            </CreatePartition>
-            <!-- Microsoft reserved partition (MSR) -->
-            <CreatePartition wcm:action="add">
-              <Order>3</Order>
-              <Type>MSR</Type>
-              <Size>128</Size>
-            </CreatePartition>
-            <!-- Windows partition -->
-            <CreatePartition wcm:action="add">
-              <Order>4</Order>
-              <Type>Primary</Type>
-              <Extend>true</Extend>
-            </CreatePartition>
-          </CreatePartitions>
-          <ModifyPartitions>
-            <!-- Windows RE Tools partition -->
-            <ModifyPartition wcm:action="add">
-              <Order>1</Order>
-              <PartitionID>1</PartitionID>
-              <Label>WINRE</Label>
-              <Format>NTFS</Format>
-            </ModifyPartition>
-            <!-- System partition (ESP) -->
-            <ModifyPartition wcm:action="add">
-              <Order>2</Order>
-              <PartitionID>2</PartitionID>
-              <Label>System</Label>
-              <Format>FAT32</Format>
-            </ModifyPartition>
-            <!-- MSR partition does not need to be modified -->
-            <ModifyPartition wcm:action="add">
-              <Order>3</Order>
-              <PartitionID>3</PartitionID>
-            </ModifyPartition>
-            <!-- Windows partition -->
-            <ModifyPartition wcm:action="add">
-              <Order>4</Order>
-              <PartitionID>4</PartitionID>
-              <Label>Windows</Label>
-              <Letter>C</Letter>
-              <Format>NTFS</Format>
-              <TypeID>DE94BBA4-06D1-4D40-A16A-BFD50179D6AC</TypeID>
-            </ModifyPartition>
-          </ModifyPartitions>
-        </Disk>
-      </DiskConfiguration>
-      <ImageInstall>
-        <OSImage>
-          <InstallTo>
-            <DiskID>0</DiskID>
-            <PartitionID>4</PartitionID>
-          </InstallTo>
-          <InstallToAvailablePartition>false</InstallToAvailablePartition>
-        </OSImage>
-      </ImageInstall>
-      <UserData>
-        <ProductKey>
-          <Key>FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4</Key>
-          <WillShowUI>Never</WillShowUI>
-        </ProductKey>
-        <AcceptEula>true</AcceptEula>
-        <FullName>Docker</FullName>
-        <Organization/>
-      </UserData>
-      <EnableFirewall>false</EnableFirewall>
-    </component>
-    <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>
-        </PathAndCredentials>
-        <PathAndCredentials wcm:action="add" wcm:keyValue="2">
-          <Path>D:\NetKVM\w7\amd64</Path>
-        </PathAndCredentials>
-        <PathAndCredentials wcm:action="add" wcm:keyValue="3">
-          <Path>D:\Balloon\w7\amd64</Path>
-        </PathAndCredentials>
-        <PathAndCredentials wcm:action="add" wcm:keyValue="4">
-          <Path>D:\pvpanic\w7\amd64</Path>
-        </PathAndCredentials>
-        <PathAndCredentials wcm:action="add" wcm:keyValue="5">
-          <Path>D:\qemupciserial\w7\amd64</Path>
-        </PathAndCredentials>
-        <PathAndCredentials wcm:action="add" wcm:keyValue="6">
-          <Path>D:\qxldod\w7\amd64</Path>
-        </PathAndCredentials>
-        <PathAndCredentials wcm:action="add" wcm:keyValue="7">
-          <Path>D:\vioinput\w7\amd64</Path>
-        </PathAndCredentials>
-        <PathAndCredentials wcm:action="add" wcm:keyValue="8">
-          <Path>D:\viorng\w7\amd64</Path>
-        </PathAndCredentials>
-        <PathAndCredentials wcm:action="add" wcm:keyValue="9">
-          <Path>D:\vioscsi\w7\amd64</Path>
-        </PathAndCredentials>
-        <PathAndCredentials wcm:action="add" wcm:keyValue="10">
-          <Path>D:\vioserial\w7\amd64</Path>
-        </PathAndCredentials>
-      </DriverPaths>
-    </component>
-  </settings>
-  <settings pass="specialize">
-    <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-      <InputLocale>0409:00000409</InputLocale>
-      <SystemLocale>en-US</SystemLocale>
-      <UILanguage>en-US</UILanguage>
-      <UserLocale>en-US</UserLocale>
-    </component>
-    <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-      <SkipAutoActivation>true</SkipAutoActivation>
-    </component>
-    <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-      <CEIPEnabled>0</CEIPEnabled>
-    </component>
-  </settings>
-  <settings pass="oobeSystem">
-    <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-      <UserAccounts>
-        <LocalAccounts>
-          <LocalAccount wcm:action="add">
-            <Name>Docker</Name>
-            <Group>Administrators</Group>
-            <Password>
-              <Value/>
-              <PlainText>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>
-        <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen>
-        <HideOnlineAccountScreens>true</HideOnlineAccountScreens>
-        <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE>
-        <NetworkLocation>Home</NetworkLocation>
-        <ProtectYourPC>1</ProtectYourPC>
-        <SkipUserOOBE>true</SkipUserOOBE>
-        <SkipMachineOOBE>true</SkipMachineOOBE>
-      </OOBE>
-      <RegisteredOrganization/>
-      <RegisteredOwner>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>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>2</Order>
-          <RequiresUserInput>false</RequiresUserInput>
-          <CommandLine>cmd /C wmic useraccount where name="Docker" set PasswordExpires=false</CommandLine>
-          <Description>Password Never Expires</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>3</Order>
-          <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine>
-          <Description>Install VirtIO drivers</Description>
-        </SynchronousCommand>
-      </FirstLogonCommands>
-    </component>
-  </settings>
-</unattend>
--- a/assets/win81x64.xml
+++ b/assets/win81x64.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State">
-  <settings pass="offlineServicing"/>
  <settings pass="windowsPE">
    <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
      <SetupUILanguage>
@@ -49,6 +48,7 @@
              <PartitionID>1</PartitionID>
              <Label>WINRE</Label>
              <Format>NTFS</Format>
+              <TypeID>DE94BBA4-06D1-4D40-A16A-BFD50179D6AC</TypeID>
            </ModifyPartition>
            <!-- System partition (ESP) -->
            <ModifyPartition wcm:action="add">
@@ -69,13 +69,18 @@
              <Label>Windows</Label>
              <Letter>C</Letter>
              <Format>NTFS</Format>
-              <TypeID>DE94BBA4-06D1-4D40-A16A-BFD50179D6AC</TypeID>
            </ModifyPartition>
          </ModifyPartitions>
        </Disk>
      </DiskConfiguration>
      <ImageInstall>
        <OSImage>
+          <InstallFrom>
+            <MetaData wcm:action="add">
+              <Value>Windows 8.1 Pro</Value>
+              <Key>/IMAGE/NAME</Key>
+            </MetaData>
+          </InstallFrom>
          <InstallTo>
            <DiskID>0</DiskID>
            <PartitionID>4</PartitionID>
@@ -86,18 +91,18 @@
      <UserData>
        <ProductKey>
          <Key>GCRJD-8NW9H-F2CDX-CCM8D-9D6T9</Key>
-          <WillShowUI>Never</WillShowUI>
+          <WillShowUI>OnError</WillShowUI>
        </ProductKey>
        <AcceptEula>true</AcceptEula>
        <FullName>Docker</FullName>
-        <Organization/>
+        <Organization>Docker</Organization>
      </UserData>
      <EnableFirewall>false</EnableFirewall>
    </component>
    <component name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
      <DriverPaths>
        <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-          <Path>D:\viostor\w8.1\amd64</Path>
+          <Path>D:\viostor\w10\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="2">
          <Path>D:\NetKVM\w8.1\amd64</Path>
@@ -121,7 +126,7 @@
          <Path>D:\viorng\w8.1\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="9">
-          <Path>D:\vioscsi\w8.1\amd64</Path>
+          <Path>D:\vioscsi\w10\amd64</Path>
        </PathAndCredentials>
        <PathAndCredentials wcm:action="add" wcm:keyValue="10">
          <Path>D:\vioserial\w8.1\amd64</Path>
@@ -129,6 +134,11 @@
      </DriverPaths>
    </component>
  </settings>
+  <settings pass="offlineServicing">
+    <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
+      <EnableLUA>false</EnableLUA>
+    </component>
+  </settings>
  <settings pass="specialize">
    <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
      <InputLocale>0409:00000409</InputLocale>
@@ -180,18 +190,16 @@
        <SkipUserOOBE>true</SkipUserOOBE>
        <SkipMachineOOBE>true</SkipMachineOOBE>
      </OOBE>
-      <RegisteredOrganization/>
-      <RegisteredOwner>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>
-          <RequiresUserInput>false</RequiresUserInput>
-          <CommandLine>cmd /C wmic useraccount where name="Docker" set PasswordExpires=false</CommandLine>
-          <Description>Password Never Expires</Description>
+          <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>
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,13 +3,13 @@ services:
  windows:
    image: dockurr/windows
    container_name: windows
-    environment:
-      VERSION: "win11x64"
    devices:
      - /dev/kvm
    cap_add:
      - NET_ADMIN
    ports:
      - 8006:8006
+      - 3389:3389/tcp
+      - 3389:3389/udp
    stop_grace_period: 2m
    restart: unless-stopped
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,4 @@
-<h1 align="center">Windows in Docker<br />
+<h1 align="center">Windows<br />
 <div align="center">
 <img src="https://github.com/dockur/windows/raw/master/.github/logo.png" title="Logo" style="max-width:100%;" width="128" />
 </div>
@@ -30,14 +30,14 @@ services:
  windows:
    image: dockurr/windows
    container_name: windows
-    environment:
-      VERSION: "win11x64"
    devices:
      - /dev/kvm
    cap_add:
      - NET_ADMIN
    ports:
      - 8006:8006
+      - 3389:3389/tcp
+      - 3389:3389/udp
    stop_grace_period: 2m
    restart: unless-stopped
 ```
@@ -45,7 +45,7 @@ services:
 Via `docker run`

 ```bash
-docker run -it --rm -e "VERSION=win11x64" -p 8006:8006 --device=/dev/kvm --cap-add NET_ADMIN dockurr/windows
+docker run -it --rm -p 8006:8006 --device=/dev/kvm --cap-add NET_ADMIN dockurr/windows
 ```

 ## FAQ
@@ -54,36 +54,32 @@ docker run -it --rm -e "VERSION=win11x64" -p 8006:8006 --device=/dev/kvm --cap-a

    Very simple! These are the steps:
    
-    - Start the container and get some coffee, it will start downloading the ISO.
+    - Start the container and get some coffee.

-    - Connect to port 8006 of the container in your web browser and wait untill you see the screen.
+    - Connect to port 8006 of the container in your web browser.

-    - Sit back and relax while all the magic happens, the whole installation will be performed fully automatic.
+    - Sit back and relax while the magic happens, the whole installation will be performed fully automatic.

-    - Once you see your desktop, your Windows installation is ready for use. Enjoy it, and don't forget to star this repo!
+    - Once you see the desktop, your Windows installation is ready for use. Enjoy it, and don't forget to star this repo!

-  * ### How do I specify the Windows version?
+  * ### How do I select the Windows version?

-    You can modify the `VERSION` environment variable in order to specify the version of Windows you want to download:
+    By default, Windows 11 will be installed. But you can add the `VERSION` environment variable to your compose file, in order to specify an alternative Windows version to download:

    ```yaml
    environment:
-      VERSION: "win11x64"
+      VERSION: "win11"
    ```
    
    Select from the values below:
    
-    - ```win11x64``` (Windows 11)
-    - ```win10x64``` (Windows 10)
-    - ```win81x64``` (Windows 8.1)
-    - ```win2022-eval``` (Windows Server 2022)
-    - ```win2019-eval``` (Windows Server 2019)
-    - ```win2016-eval``` (Windows Server 2016)
-
-  * ### How do I use a custom ISO file?
-
-    You can supply your own ISO file by naming it ```custom.iso``` and placing it in the ```/storage``` folder. Then follow the same steps as for [manual installation](https://github.com/dockur/windows/tree/dev?tab=readme-ov-file#how-do-i-perform-a-manual-installation).
-
+    - ```win11``` = Windows 11
+    - ```win10``` = Windows 10
+    - ```win81``` = Windows 8.1
+    - ```win22``` = Windows Server 2022
+    - ```win19``` = Windows Server 2019
+    - ```win16``` = Windows Server 2016
+ 
  * ### How do I increase the amount of CPU or RAM?

    By default, 2 CPU cores and 4 GB of RAM are allocated to the container, as those are the minimum requirements of Windows 11.
@@ -96,20 +92,20 @@ docker run -it --rm -e "VERSION=win11x64" -p 8006:8006 --device=/dev/kvm --cap-a
      CPU_CORES: "4"
    ```

-  * ### How do I change the size of the data disk?
+  * ### How do I change the size of the disk?

    To expand the default size of 64 GB, add the `DISK_SIZE` setting to your compose file and set it to your preferred capacity:

    ```yaml
    environment:
-      DISK_SIZE: "128G"
+      DISK_SIZE: "256G"
    ```
    
    This can also be used to resize the existing disk to a larger capacity without any data loss.
    
-  * ### How do I change the location of the data disk?
+  * ### How do I change the storage location?

-    To change the location of the data disk, include the following bind mount in your compose file:
+    To change the storage location, include the following bind mount in your compose file:

    ```yaml
    volumes:
@@ -118,37 +114,18 @@ docker run -it --rm -e "VERSION=win11x64" -p 8006:8006 --device=/dev/kvm --cap-a

    Replace the example path `/var/win` with the desired storage folder.

-  * ### How do I verify if my system supports KVM?
-
-    To verify if your system supports KVM, run the following commands:
-
-    ```bash
-    sudo apt install cpu-checker
-    sudo kvm-ok
-    ```
-
-    If you receive an error from `kvm-ok` indicating that KVM acceleration can't be used, check the virtualization settings in the BIOS.
-
-  * ### How do I view the screen?
-
-    The container includes a web-based viewer, so you can visit [http://localhost:8006/](http://localhost:8006/) using any web browser to view the screen and interact with Windows via the keyboard or mouse.
-
-    This is mainly for use during installation, as afterwards you can use Remote Desktop, TeamViewer or any other software you prefer.
-
  * ### How do I perform a manual installation?

-    If you prefer to perform the installation manually in order to customize some options, add the following environment variable:
+    If you prefer to perform the installation manually in order to customize some options, such as selecting another edition, add the following environment variable:

    ```yaml
    environment:
-      ATTENDED: "Y"
+      MANUAL: "Y"
    ```

    Then follow these steps:

-    - Start the container and wait until the ISO download is completed. If needed, you can view this progress in the Docker log. Wait until you see the message ```BdsDxe: starting Boot```.
-
-    - Connect to port 8006 of the container in your web browser, you will see the Windows installation screen.
+    - Start the container and connect to port 8006 of the container in your web browser. After the download is finished, you will see the Windows installation screen.

    - Start the installation by clicking ```Install now```. On the next screen, press 'OK' when prompted to ```Load driver``` and select the ```VirtIO SCSI``` driver from the list that matches your Windows version. So for Windows 11, select ```D:\amd64\w11\vioscsi.inf``` and click 'Next'.

@@ -160,10 +137,47 @@ docker run -it --rm -e "VERSION=win11x64" -p 8006:8006 --device=/dev/kvm --cap-a

    - Wait until Windows finishes copying files and completes the installation.

-    - Once you see your desktop, open File Explorer and navigate to the CD-ROM drive (D:). Double-click on ```virtio-win-gt-x64``` and proceed to install the VirtIO drivers.
+    - Once you see the desktop, open File Explorer and navigate to the CD-ROM drive (E:). Double-click on ```virtio-win-gt-x64.msi``` and proceed to install the VirtIO drivers.

    - Now your Windows installation is ready for use. Enjoy it, and don't forget to star this repo!

+  * ### How do I install an unsupported version?
+
+    You can specify an URL in the `VERSION` environment variable, in order to download a custom ISO image:
+    
+    ```yaml
+    environment:
+      VERSION: "https://example.com/win.iso"
+    ```
+    
+    During the installation you may need to add some drivers as described in [manual installation](https://github.com/dockur/windows/tree/master?tab=readme-ov-file#how-do-i-perform-a-manual-installation) above.
+
+  * ### How do I pass-through a disk?
+
+    It is possible to pass-through disk devices directly by adding them to your compose file in this way:
+
+    ```yaml
+    environment:
+      DEVICE: "/dev/sda"
+      DEVICE2: "/dev/sdb"
+    devices:
+      - /dev/sda
+      - /dev/sdb
+    ```
+
+    Use ```DEVICE``` if you want it to become your main drive, and use ```DEVICE2``` and higher to add them as secondary drives.
+    
+  * ### How do I verify if my system supports KVM?
+
+    To verify if your system supports KVM, run the following commands:
+
+    ```bash
+    sudo apt install cpu-checker
+    sudo kvm-ok
+    ```
+
+    If you receive an error from `kvm-ok` indicating that KVM acceleration can't be used, check the virtualization settings in the BIOS.
+
  * ### Is this project legal?

    Yes, this project contains only open-source code and does not distribute any copyrighted material. Neither does it try to circumvent any copyright protection measures. So under all applicable laws, this project would be considered legal. 
--- a/src/entry.sh
+++ b/src/entry.sh
@@ -3,13 +3,10 @@ set -Eeuo pipefail

 echo "❯ Starting Windows for Docker v$(</run/version)..."
 echo "❯ For support visit https://github.com/dockur/windows"
+echo

-export DISPLAY=web
 export BOOT_MODE=windows

-ln -sfn /usr/share/novnc/vnc_lite.html /usr/share/novnc/index.html
-websockify -D --web /usr/share/novnc/ 8006 localhost:5900 2>/dev/null
-
 cd /run

 . reset.sh      # Initialize system
@@ -23,10 +20,11 @@ cd /run

 trap - ERR

-mkdir -p /tmp/emulated_tpm
-swtpm socket -t -d --tpmstate dir=/tmp/emulated_tpm --ctrl type=unixio,path=/tmp/emulated_tpm/swtpm-sock --log level=1 --tpm2
+if [[ "${DISPLAY,,}" == "web" ]]; then
+  nginx -e stderr
+fi

-info "Booting Windows using $VERS..."
+echo && info "Booting Windows using $VERS..."

 [[ "$DEBUG" == [Yy1]* ]] && set -x
 exec qemu-system-x86_64 ${ARGS:+ $ARGS}
--- a/src/install.sh
+++ b/src/install.sh
@@ -1,57 +1,274 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail

-: "${ATTENDED:="N"}"
+: "${MANUAL:=""}"
+: "${EXTERNAL:=""}"
 : "${VERSION:="win11x64"}"

-ARGUMENTS="-chardev socket,id=chrtpm,path=/tmp/emulated_tpm/swtpm-sock $ARGUMENTS"
-ARGUMENTS="-tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0 $ARGUMENTS"
+[[ "${VERSION,,}" == "11" ]] && VERSION="win11x64"
+[[ "${VERSION,,}" == "win11" ]] && VERSION="win11x64"
+
+[[ "${VERSION,,}" == "10" ]] && VERSION="win10x64"
+[[ "${VERSION,,}" == "win10" ]] && VERSION="win10x64"
+
+[[ "${VERSION,,}" == "8" ]] && VERSION="win81x64"
+[[ "${VERSION,,}" == "81" ]] && VERSION="win81x64"
+[[ "${VERSION,,}" == "8.1" ]] && VERSION="win81x64"
+[[ "${VERSION,,}" == "win81" ]] && VERSION="win81x64"
+[[ "${VERSION,,}" == "win8" ]] && VERSION="win81x64"
+
+[[ "${VERSION,,}" == "22" ]] && VERSION="win2022-eval"
+[[ "${VERSION,,}" == "2022" ]] && VERSION="win2022-eval"
+[[ "${VERSION,,}" == "win22" ]] && VERSION="win2022-eval"
+[[ "${VERSION,,}" == "win2022" ]] && VERSION="win2022-eval"
+
+[[ "${VERSION,,}" == "19" ]] && VERSION="win2019-eval"
+[[ "${VERSION,,}" == "2019" ]] && VERSION="win2019-eval"
+[[ "${VERSION,,}" == "win19" ]] && VERSION="win2019-eval"
+[[ "${VERSION,,}" == "win2019" ]] && VERSION="win2019-eval"
+
+[[ "${VERSION,,}" == "16" ]] && VERSION="win2016-eval"
+[[ "${VERSION,,}" == "2016" ]] && VERSION="win2016-eval"
+[[ "${VERSION,,}" == "win16" ]] && VERSION="win2016-eval"
+[[ "${VERSION,,}" == "win2016" ]] && VERSION="win2016-eval"
+
+if [[ "${VERSION,,}" == "tiny10" ]]; then
+  VERSION="https://archive.org/download/tiny-10-23-h2/tiny10%20x64%2023h2.iso"
+fi
+
+if [[ "${VERSION,,}" == "tiny11" ]]; then
+  VERSION="https://archive.org/download/tiny-11-core-x-64-beta-1/tiny11%20core%20x64%20beta%201.iso"
+fi
+
+if [[ "${VERSION,,}" == "http"* ]]; then
+  EXTERNAL="Y"
+else
+  EXTERNAL="N"
+fi
+
+MSG="Please wait while Windows is being started..."
+
+BASE="custom.iso"
+if [ ! -f "$STORAGE/$BASE" ]; then
+
+  if [[ "$EXTERNAL" != [Yy1]* ]]; then
+
+    BASE="$VERSION.iso"
+    if [ ! -f "$STORAGE/$BASE" ]; then
+      MSG="Please wait while Windows is being downloaded..."
+    fi
+
+  else
+
+    BASE=$(basename "${VERSION%%\?*}")
+    : "${BASE//+/ }"; printf -v BASE '%b' "${_//%/\\x}"
+    BASE=$(echo "$BASE" | sed -e 's/[^A-Za-z0-9._-]/_/g')
+
+    if [ ! -f "$STORAGE/$BASE" ]; then
+      MSG="Please wait while '$BASE' is being downloaded..."
+    fi
+
+  fi
+fi
+
+# Display wait message
+/run/server.sh "Windows" "$MSG" &

-BASE="$VERSION.iso"
 [ -f "$STORAGE/$BASE" ] && return 0

 TMP="$STORAGE/tmp"
 rm -rf "$TMP"
 mkdir -p "$TMP"

-if [ -f "$STORAGE/custom.iso" ]; then
-  cp "$STORAGE/custom.iso" "$TMP/$BASE"
-fi
+ISO="$TMP/$BASE"
+rm -f "$ISO"

-if [ ! -f "$TMP/$BASE" ]; then
+if [[ "$EXTERNAL" != [Yy1]* ]]; then

  SCRIPT="$TMP/mido.sh"

+  rm -f "$SCRIPT"
  cp /run/mido.sh "$SCRIPT"
  chmod +x "$SCRIPT"
  cd "$TMP"
  bash "$SCRIPT" "$VERSION"
-  cd /run
  rm -f "$SCRIPT"
+  cd /run

-  [ ! -f "$TMP/$BASE" ] && error "Failed to download $VERSION.iso from the Microsoft servers!" && exit 66
+else
+
+  info "Downloading $BASE as boot image..."
+
+  # Check if running with interactive TTY or redirected to docker log
+  if [ -t 1 ]; then
+    PROGRESS="--progress=bar:noscroll"
+  else
+    PROGRESS="--progress=dot:giga"
+  fi
+
+  { wget "$VERSION" -O "$ISO" -q --no-check-certificate --show-progress "$PROGRESS"; rc=$?; } || :
+
+  (( rc != 0 )) && echo && error "Failed to download $VERSION, reason: $rc" && exit 60

 fi

-info "Preparing ISO image for installation..."
+[ ! -f "$ISO" ] && echo && error "Failed to download $VERSION" && exit 61
+
+SIZE=$(stat -c%s "$ISO")
+
+if ((SIZE<10000000)); then
+  echo && error "Invalid ISO file: Size is smaller than 10 MB" && exit 62
+fi
+
+echo && info "Extracting downloaded ISO image..."

 DIR="$TMP/unpack"
-7z x "$TMP/$BASE" -o"$DIR"
+rm -rf "$DIR"

-if [[ "$ATTENDED" != [Yy1]* ]]; then
-  if [ -f "/run/assets/$VERSION.xml" ]; then
+7z x "$ISO" -o"$DIR" > /dev/null
+echo

-    wimlib-imagex update "$DIR/sources/boot.wim" 2 \
-      --command "add /run/assets/$VERSION.xml /autounattend.xml"
+XML=""
+FB="falling back to manual installation!"

+if [ -z "$MANUAL" ]; then
+
+  MANUAL="N"
+
+  if [[ "$EXTERNAL" == [Yy1]* ]]; then
+    [[ "${BASE,,}" == "tiny10"* ]] && MANUAL="Y"
+  fi
+
+fi
+
+if [[ "$MANUAL" != [Yy1]* ]]; then
+  if [[ "$EXTERNAL" != [Yy1]* ]]; then
+
+    XML="$VERSION.xml"
+
+  else
+
+    info "Detecting Windows version from ISO image..."
+
+    LOC="$DIR/sources/install.wim"
+    [ ! -f "$LOC" ] && LOC="$DIR/sources/install.esd"
+
+    if [ -f "$LOC" ]; then
+
+      DETECTED=""
+      TAG="DISPLAYNAME"
+      RESULT=$(wimlib-imagex info -xml "$LOC" | tr -d '\000')
+      NAME=$(sed -n "/$TAG/{s/.*<$TAG>\(.*\)<\/$TAG>.*/\1/;p}" <<< "$RESULT")
+
+      if [ -z "$NAME" ]; then
+        TAG="PRODUCTNAME"
+        NAME=$(sed -n "/$TAG/{s/.*<$TAG>\(.*\)<\/$TAG>.*/\1/;p}" <<< "$RESULT")
+      fi
+
+      [[ "${NAME,,}" == "windows 11"* ]] && DETECTED="win11x64"
+      [[ "${NAME,,}" == "windows 10"* ]] && DETECTED="win10x64"
+      [[ "${NAME,,}" == "windows 8"* ]] && DETECTED="win81x64"
+      [[ "${NAME,,}" == *"server 2022"* ]] && DETECTED="win2022-eval"
+      [[ "${NAME,,}" == *"server 2019"* ]] && DETECTED="win2019-eval"
+      [[ "${NAME,,}" == *"server 2016"* ]] && DETECTED="win2016-eval"
+
+      if [ -n "$DETECTED" ]; then
+
+        XML="$DETECTED.xml"
+        echo "Detected image of type '$DETECTED', will apply autounattend.xml file."
+
+      else
+        if [ -z "$NAME" ]; then
+          error "Warning: failed to detect Windows version from image, $FB"
+        else
+          if [[ "${NAME,,}" == "windows 7" ]]; then
+            error "Warning: detected Windows 7 image, $FB"
+          else
+            error "Warning: failed to detect Windows version from string '$NAME', $FB"
+          fi
+        fi
+      fi
+    else
+      error "Warning: failed to locate 'install.wim' or 'install.esd' in ISO image, $FB"
+    fi
+    echo
  fi
 fi

-genisoimage -b boot/etfsboot.com -no-emul-boot -c BOOT.CAT -iso-level 4 -J -l -D -N -joliet-long -relaxed-filenames \
-            -v -V "$VERSION" -udf -boot-info-table -eltorito-alt-boot -eltorito-boot efi/microsoft/boot/efisys_noprompt.bin \
-            -no-emul-boot -o "$TMP/$BASE.tmp" -allow-limited-size "$DIR"
+ASSET="/run/assets/$XML"

-mv "$TMP/$BASE.tmp" "$STORAGE/$BASE"
+if [ -f "$ASSET" ]; then
+
+  LOC="$DIR/sources/boot.wim"
+  [ ! -f "$LOC" ] && LOC="$DIR/sources/boot.esd"
+
+  if [ -f "$LOC" ]; then
+
+    info "Adding XML file for automatic installation..."
+
+    RESULT=$(wimlib-imagex info -xml "$LOC" | tr -d '\000')
+
+    if [[ "${RESULT^^}" == *"<IMAGE INDEX=\"2\">"* ]]; then
+      INDEX="2"
+    else
+      INDEX="1"
+    fi
+
+    wimlib-imagex update "$LOC" "$INDEX" --command "add $ASSET /autounattend.xml" > /dev/null
+
+  else
+    error "Warning: failed to locate 'boot.wim' or 'boot.esd' in ISO image, $FB"
+  fi
+
+  LOC="$DIR/autounattend.xml"
+  [ -f "$LOC" ] && mv -f "$ASSET" "$LOC"
+  LOC="$DIR/Autounattend.xml"
+  [ -f "$LOC" ] && mv -f "$ASSET" "$LOC"
+  LOC="$DIR/AutoUnattend.xml"
+  [ -f "$LOC" ] && mv -f "$ASSET" "$LOC"
+  LOC="$DIR/autounattend.XML"
+  [ -f "$LOC" ] && mv -f "$ASSET" "$LOC"
+  LOC="$DIR/Autounattend.XML"
+  [ -f "$LOC" ] && mv -f "$ASSET" "$LOC"
+  LOC="$DIR/AutoUnattend.XML"
+  [ -f "$LOC" ] && mv -f "$ASSET" "$LOC"
+  LOC="$DIR/AUTOUNATTEND.xml"
+  [ -f "$LOC" ] && mv -f "$ASSET" "$LOC"
+  LOC="$DIR/AUTOUNATTEND.XML"
+  [ -f "$LOC" ] && mv -f "$ASSET" "$LOC"
+
+  echo
+
+else
+  [ -n "$XML" ] && error "Warning: XML file '$XML' does not exist, $FB" && echo
+fi
+
+ETFS="boot/etfsboot.com"
+EFISYS="efi/microsoft/boot/efisys_noprompt.bin"
+
+if [ -f "$DIR/$ETFS" ]; then
+  if [ -f "$DIR/$EFISYS" ]; then
+
+    CAT="BOOT.CAT"
+    LABEL="${BASE%.*}"
+    LABEL="${LABEL::32}"
+    ISO="$TMP/$LABEL.tmp"
+    rm -f "$ISO"
+
+    info "Generating new ISO image for installation..."
+
+    genisoimage -b "$ETFS" -no-emul-boot -c "$CAT" -iso-level 4 -J -l -D -N -joliet-long -relaxed-filenames -quiet -V "$LABEL" -udf \
+                           -boot-info-table -eltorito-alt-boot -eltorito-boot "$EFISYS" -no-emul-boot -o "$ISO" -allow-limited-size "$DIR"
+
+  else
+    error "Failed to locate file 'efisys_noprompt.bin' in ISO image, $FB"
+  fi
+else
+  error "Failed to locate file 'etfsboot.com' in ISO image, $FB"
+fi
+
+mv "$ISO" "$STORAGE/$BASE"
 rm -rf "$TMP"

+echo
 return 0
Author	SHA1	Message	Date
Kroese	42b412704c	docs: Readme (#56 )	2024-01-19 04:31:20 +01:00
Kroese	245b3fc019	fix: Sanitize filename (#55 )	2024-01-19 04:28:03 +01:00
Kroese	5137d513fc	feat: Support more image layouts (#54 )	2024-01-19 01:25:39 +01:00
Kroese	82bccfc43d	feat: Disable hardware checks (#52 )	2024-01-18 19:11:59 +01:00
Kroese	5a56b717c4	feat: Move TPM emulator (#49 )	2024-01-18 10:32:39 +01:00
Kroese	4a8f55ec58	fix: Allow RDP login with blank passwords (#47 )	2024-01-17 22:51:29 +01:00
Kroese	447c9cf53d	build: Remove Python from image (#45 )	2024-01-17 20:30:52 +01:00
Kroese	5bd9da2baa	docs: Disk pass-through (#43 )	2024-01-17 16:32:20 +01:00
Kroese	c8f243f357	docs: Readme (#41 )	2024-01-17 04:09:31 +01:00
Kroese	babd608a23	docs: Readme (#40 )	2024-01-17 04:01:42 +01:00
Kroese	06722236be	feat: Improved installation (#39 )	2024-01-17 03:40:19 +01:00
Kroese	27bb072401	feat: Display wait message (#37 )	2024-01-16 19:58:55 +01:00
Kroese	3516206310	docs: Readme (#33 )	2024-01-16 05:38:04 +01:00
Kroese	87f26d1d7b	docs: Readme (#32 )	2024-01-16 05:29:56 +01:00
Kroese	be349606f8	docs: Custom ISO (#31 )	2024-01-16 04:28:16 +01:00
Kroese	7c88b1e0ac	feat: Set custom label (#30 )	2024-01-16 02:49:50 +01:00
Kroese	d057b5bd06	build: Ignore .xml files (#27 )	2024-01-16 01:20:13 +01:00
Kroese	adb91fe3c8	fix: Installation configuration (#26 )	2024-01-16 01:18:58 +01:00
Kroese	8ce4857b33	docs: Fix link (#25 )	2024-01-16 00:02:46 +01:00