From 8474b917b2efa61e33ae8ff5f14b9e980d2c25a9 Mon Sep 17 00:00:00 2001 From: Kroese Date: Tue, 23 Jan 2024 04:07:06 +0100 Subject: [PATCH] fix: Windows config (#80) --- assets/win10x64.xml | 22 ++++++++++++++++------ assets/win11x64.xml | 22 ++++++++++++++++------ assets/win2016-eval.xml | 27 +++++++++++++++------------ assets/win2019-eval.xml | 22 ++++++++++++++++------ assets/win2022-eval.xml | 24 +++++++++++++++++------- assets/win81x64.xml | 25 ++++++++++++++----------- src/install.sh | 2 +- 7 files changed, 95 insertions(+), 49 deletions(-) diff --git a/assets/win10x64.xml b/assets/win10x64.xml index 824978a..88a117e 100644 --- a/assets/win10x64.xml +++ b/assets/win10x64.xml @@ -1,4 +1,4 @@ - + @@ -164,7 +164,7 @@ Dockur Windows for Docker 24/7 - + Dockur https://github.com/dockur/windows/issues @@ -266,8 +266,8 @@ - - + + 0409:00000409 @@ -282,7 +282,7 @@ Docker Administrators - + true</PlainText> </Password> </LocalAccount> @@ -297,7 +297,7 @@ <Enabled>true</Enabled> <LogonCount>1</LogonCount> <Password> - <Value/> + <Value /> <PlainText>true</PlainText> </Password> </AutoLogon> @@ -344,6 +344,16 @@ <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine> <Description>Install VirtIO drivers</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> </FirstLogonCommands> </component> </settings> diff --git a/assets/win11x64.xml b/assets/win11x64.xml index 027473e..a993f01 100644 --- a/assets/win11x64.xml +++ b/assets/win11x64.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> <settings pass="windowsPE"> <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> @@ -182,7 +182,7 @@ <Manufacturer>Dockur</Manufacturer> <Model>Windows for Docker</Model> <SupportHours>24/7</SupportHours> - <SupportPhone></SupportPhone> + <SupportPhone /> <SupportProvider>Dockur</SupportProvider> <SupportURL>https://github.com/dockur/windows/issues</SupportURL> </OEMInformation> @@ -284,8 +284,8 @@ </RunSynchronous> </component> </settings> - <settings pass="auditSystem"/> - <settings pass="auditUser"/> + <settings pass="auditSystem" /> + <settings pass="auditUser" /> <settings pass="oobeSystem"> <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <InputLocale>0409:00000409</InputLocale> @@ -300,7 +300,7 @@ <Name>Docker</Name> <Group>Administrators</Group> <Password> - <Value/> + <Value /> <PlainText>true</PlainText> </Password> </LocalAccount> @@ -315,7 +315,7 @@ <Enabled>true</Enabled> <LogonCount>1</LogonCount> <Password> - <Value/> + <Value /> <PlainText>true</PlainText> </Password> </AutoLogon> @@ -370,6 +370,16 @@ <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine> <Description>Install VirtIO drivers</Description> </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>8</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>9</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> </FirstLogonCommands> </component> </settings> diff --git a/assets/win2016-eval.xml b/assets/win2016-eval.xml index 3206623..bd6d3a4 100644 --- a/assets/win2016-eval.xml +++ b/assets/win2016-eval.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="UTF-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> <settings pass="windowsPE"> <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> @@ -102,7 +102,7 @@ <AcceptEula>true</AcceptEula> <FullName>Docker</FullName> <Organization>Windows for Docker</Organization> - <ProductKey/> + <ProductKey /> </UserData> <EnableFirewall>false</EnableFirewall> <Diagnostics> @@ -161,7 +161,7 @@ </component> </settings> <settings pass="specialize"> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <SkipAutoActivation>true</SkipAutoActivation> </component> <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> @@ -169,10 +169,6 @@ <OEMInformation> <Manufacturer>Dockur</Manufacturer> <Model>Windows for Docker</Model> - <SupportHours>24/7</SupportHours> - <SupportPhone></SupportPhone> - <SupportProvider>Dockur</SupportProvider> - <SupportURL>https://github.com/dockur/windows/issues</SupportURL> </OEMInformation> <OEMName>Windows for Docker</OEMName> </component> @@ -216,7 +212,7 @@ <Name>Docker</Name> <Group>Administrators</Group> <Password> - <Value/> + <Value /> <PlainText>true</PlainText> </Password> </LocalAccount> @@ -231,7 +227,7 @@ <Enabled>true</Enabled> <LogonCount>1</LogonCount> <Password> - <Value/> + <Value /> <PlainText>true</PlainText> </Password> </AutoLogon> @@ -245,9 +241,6 @@ <ProtectYourPC>3</ProtectYourPC> <SkipUserOOBE>true</SkipUserOOBE> <SkipMachineOOBE>true</SkipMachineOOBE> - <VMModeOptimizations> - <SkipWinREInitialization>true</SkipWinREInitialization> - </VMModeOptimizations> </OOBE> <RegisteredOrganization>Dockur</RegisteredOrganization> <RegisteredOwner>Windows for Docker</RegisteredOwner> @@ -278,6 +271,16 @@ <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine> <Description>Install VirtIO drivers</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> </FirstLogonCommands> </component> </settings> diff --git a/assets/win2019-eval.xml b/assets/win2019-eval.xml index cc87ce2..8ea29bd 100644 --- a/assets/win2019-eval.xml +++ b/assets/win2019-eval.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="UTF-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> <settings pass="windowsPE"> <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> @@ -102,7 +102,7 @@ <AcceptEula>true</AcceptEula> <FullName>Docker</FullName> <Organization>Windows for Docker</Organization> - <ProductKey/> + <ProductKey /> </UserData> <EnableFirewall>false</EnableFirewall> <Diagnostics> @@ -161,7 +161,7 @@ </component> </settings> <settings pass="specialize"> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <SkipAutoActivation>true</SkipAutoActivation> </component> <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> @@ -170,7 +170,7 @@ <Manufacturer>Dockur</Manufacturer> <Model>Windows for Docker</Model> <SupportHours>24/7</SupportHours> - <SupportPhone></SupportPhone> + <SupportPhone /> <SupportProvider>Dockur</SupportProvider> <SupportURL>https://github.com/dockur/windows/issues</SupportURL> </OEMInformation> @@ -216,7 +216,7 @@ <Name>Docker</Name> <Group>Administrators</Group> <Password> - <Value/> + <Value /> <PlainText>true</PlainText> </Password> </LocalAccount> @@ -231,7 +231,7 @@ <Enabled>true</Enabled> <LogonCount>1</LogonCount> <Password> - <Value/> + <Value /> <PlainText>true</PlainText> </Password> </AutoLogon> @@ -278,6 +278,16 @@ <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine> <Description>Install VirtIO drivers</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> </FirstLogonCommands> </component> </settings> diff --git a/assets/win2022-eval.xml b/assets/win2022-eval.xml index 6164b26..5e9e275 100644 --- a/assets/win2022-eval.xml +++ b/assets/win2022-eval.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="UTF-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> <settings pass="windowsPE"> <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> @@ -102,7 +102,7 @@ <AcceptEula>true</AcceptEula> <FullName>Docker</FullName> <Organization>Windows for Docker</Organization> - <ProductKey/> + <ProductKey /> </UserData> <EnableFirewall>false</EnableFirewall> <Diagnostics> @@ -161,7 +161,7 @@ </component> </settings> <settings pass="specialize"> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <SkipAutoActivation>true</SkipAutoActivation> </component> <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> @@ -170,7 +170,7 @@ <Manufacturer>Dockur</Manufacturer> <Model>Windows for Docker</Model> <SupportHours>24/7</SupportHours> - <SupportPhone></SupportPhone> + <SupportPhone /> <SupportProvider>Dockur</SupportProvider> <SupportURL>https://github.com/dockur/windows/issues</SupportURL> </OEMInformation> @@ -191,7 +191,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> @@ -216,7 +216,7 @@ <Name>Docker</Name> <Group>Administrators</Group> <Password> - <Value/> + <Value /> <PlainText>true</PlainText> </Password> </LocalAccount> @@ -231,7 +231,7 @@ <Enabled>true</Enabled> <LogonCount>1</LogonCount> <Password> - <Value/> + <Value /> <PlainText>true</PlainText> </Password> </AutoLogon> @@ -278,6 +278,16 @@ <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine> <Description>Install VirtIO drivers</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> </FirstLogonCommands> </component> </settings> diff --git a/assets/win81x64.xml b/assets/win81x64.xml index 08a405e..8f2f856 100644 --- a/assets/win81x64.xml +++ b/assets/win81x64.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"> <settings pass="windowsPE"> <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> @@ -162,7 +162,7 @@ </component> </settings> <settings pass="specialize"> - <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> + <component name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> <SkipAutoActivation>true</SkipAutoActivation> </component> <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"> @@ -170,10 +170,6 @@ <OEMInformation> <Manufacturer>Dockur</Manufacturer> <Model>Windows for Docker</Model> - <SupportHours>24/7</SupportHours> - <SupportPhone></SupportPhone> - <SupportProvider>Dockur</SupportProvider> - <SupportURL>https://github.com/dockur/windows/issues</SupportURL> </OEMInformation> <OEMName>Windows for Docker</OEMName> </component> @@ -195,7 +191,7 @@ <Name>Docker</Name> <Group>Administrators</Group> <Password> - <Value/> + <Value /> <PlainText>true</PlainText> </Password> </LocalAccount> @@ -210,7 +206,7 @@ <Enabled>true</Enabled> <LogonCount>1</LogonCount> <Password> - <Value/> + <Value /> <PlainText>true</PlainText> </Password> </AutoLogon> @@ -224,9 +220,6 @@ <ProtectYourPC>3</ProtectYourPC> <SkipUserOOBE>true</SkipUserOOBE> <SkipMachineOOBE>true</SkipMachineOOBE> - <VMModeOptimizations> - <SkipWinREInitialization>true</SkipWinREInitialization> - </VMModeOptimizations> </OOBE> <RegisteredOrganization>Dockur</RegisteredOrganization> <RegisteredOwner>Windows for Docker</RegisteredOwner> @@ -251,6 +244,16 @@ <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine> <Description>Install VirtIO drivers</Description> </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>5</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>6</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> </FirstLogonCommands> </component> </settings> diff --git a/src/install.sh b/src/install.sh index 456e63b..4188e30 100644 --- a/src/install.sh +++ b/src/install.sh @@ -358,7 +358,7 @@ if (( SIZE > SPACE )); then error "Not enough free space in $STORAGE, have $SPACE_GB GB available but need at least $SIZE_GB GB." && exit 63 fi -MSG="Generating new ISO image for installation..." +MSG="Generating the ISO image..." info "$MSG" && html "$MSG" genisoimage -b "$ETFS" -no-emul-boot -c "$CAT" -iso-level 4 -J -l -D -N -joliet-long -relaxed-filenames -quiet -V "$LABEL" -udf \