From b92d2589b1fc2034194e92b663249d2c3eb7d044 Mon Sep 17 00:00:00 2001 From: Kroese Date: Thu, 8 Feb 2024 17:49:26 +0100 Subject: [PATCH] feat: Improve Windows configuration (#161) --- assets/win10x64-ltsc.xml | 16 +++------------- assets/win10x64.xml | 16 +++------------- assets/win11x64.xml | 16 +++------------- assets/win2008r2.xml | 22 +++++++++++----------- assets/win2012r2-eval.xml | 11 +++-------- assets/win2016-eval.xml | 16 +++------------- assets/win2019-eval.xml | 16 +++------------- assets/win2022-eval.xml | 16 +++------------- assets/win7x64.xml | 22 +++++++++++----------- assets/win81x64.xml | 16 +++------------- assets/winvistax64.xml | 22 +++++++++++----------- src/install.sh | 2 +- src/samba.sh | 2 +- 13 files changed, 59 insertions(+), 134 deletions(-) diff --git a/assets/win10x64-ltsc.xml b/assets/win10x64-ltsc.xml index 4edf6647c..036f0d763 100644 --- a/assets/win10x64-ltsc.xml +++ b/assets/win10x64-ltsc.xml @@ -318,7 +318,7 @@ Docker true - 1 + 65432 true</PlainText> @@ -340,8 +340,8 @@ <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> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> + <Description>Allow guest access to network shares</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>2</Order> @@ -393,16 +393,6 @@ <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\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> - <Description>Allow guest access to network shares</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>13</Order> - <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine> - <Description>Install VirtIO drivers</Description> - </SynchronousCommand> </FirstLogonCommands> </component> </settings> diff --git a/assets/win10x64.xml b/assets/win10x64.xml index 1520a2b31..9c3cef8f7 100644 --- a/assets/win10x64.xml +++ b/assets/win10x64.xml @@ -314,7 +314,7 @@ <AutoLogon> <Username>Docker</Username> <Enabled>true</Enabled> - <LogonCount>1</LogonCount> + <LogonCount>65432</LogonCount> <Password> <Value /> <PlainText>true</PlainText> @@ -336,8 +336,8 @@ <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> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> + <Description>Allow guest access to network shares</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>2</Order> @@ -389,16 +389,6 @@ <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\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> - <Description>Allow guest access to network shares</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>13</Order> - <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine> - <Description>Install VirtIO drivers</Description> - </SynchronousCommand> </FirstLogonCommands> </component> </settings> diff --git a/assets/win11x64.xml b/assets/win11x64.xml index 0b1459afd..7e2bf4df8 100644 --- a/assets/win11x64.xml +++ b/assets/win11x64.xml @@ -332,7 +332,7 @@ <AutoLogon> <Username>Docker</Username> <Enabled>true</Enabled> - <LogonCount>1</LogonCount> + <LogonCount>65432</LogonCount> <Password> <Value /> <PlainText>true</PlainText> @@ -354,8 +354,8 @@ <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> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> + <Description>Allow guest access to network shares</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>2</Order> @@ -417,16 +417,6 @@ <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>14</Order> - <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> - <Description>Allow guest access to network shares</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>15</Order> - <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine> - <Description>Install VirtIO drivers</Description> - </SynchronousCommand> </FirstLogonCommands> </component> </settings> diff --git a/assets/win2008r2.xml b/assets/win2008r2.xml index 921be8c7f..275a8b98e 100644 --- a/assets/win2008r2.xml +++ b/assets/win2008r2.xml @@ -205,7 +205,7 @@ <AutoLogon> <Username>Docker</Username> <Enabled>true</Enabled> - <LogonCount>1</LogonCount> + <LogonCount>65432</LogonCount> <Password> <Value /> <PlainText>true</PlainText> @@ -224,8 +224,8 @@ <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> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> + <Description>Allow guest access to network shares</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>2</Order> @@ -259,29 +259,29 @@ </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>8</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> + <SynchronousCommand wcm:action="add"> + <Order>9</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> + <Order>10</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> + <Order>11</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> + <Order>12</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> diff --git a/assets/win2012r2-eval.xml b/assets/win2012r2-eval.xml index 2f8733251..0583fa18b 100644 --- a/assets/win2012r2-eval.xml +++ b/assets/win2012r2-eval.xml @@ -241,7 +241,7 @@ <AutoLogon> <Username>Docker</Username> <Enabled>true</Enabled> - <LogonCount>1</LogonCount> + <LogonCount>65432</LogonCount> <Password> <Value /> <PlainText>true</PlainText> @@ -263,8 +263,8 @@ <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> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> + <Description>Allow guest access to network shares</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>2</Order> @@ -316,11 +316,6 @@ <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>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine> - <Description>Install VirtIO drivers</Description> - </SynchronousCommand> </FirstLogonCommands> </component> </settings> diff --git a/assets/win2016-eval.xml b/assets/win2016-eval.xml index 7fee2747a..7dca30685 100644 --- a/assets/win2016-eval.xml +++ b/assets/win2016-eval.xml @@ -241,7 +241,7 @@ <AutoLogon> <Username>Docker</Username> <Enabled>true</Enabled> - <LogonCount>1</LogonCount> + <LogonCount>65432</LogonCount> <Password> <Value /> <PlainText>true</PlainText> @@ -263,8 +263,8 @@ <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> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> + <Description>Allow guest access to network shares</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>2</Order> @@ -316,16 +316,6 @@ <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\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> - <Description>Allow guest access to network shares</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>13</Order> - <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine> - <Description>Install VirtIO drivers</Description> - </SynchronousCommand> </FirstLogonCommands> </component> </settings> diff --git a/assets/win2019-eval.xml b/assets/win2019-eval.xml index 8debaaa3d..3e849f7ba 100644 --- a/assets/win2019-eval.xml +++ b/assets/win2019-eval.xml @@ -245,7 +245,7 @@ <AutoLogon> <Username>Docker</Username> <Enabled>true</Enabled> - <LogonCount>1</LogonCount> + <LogonCount>65432</LogonCount> <Password> <Value /> <PlainText>true</PlainText> @@ -267,8 +267,8 @@ <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> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> + <Description>Allow guest access to network shares</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>2</Order> @@ -320,16 +320,6 @@ <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\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> - <Description>Allow guest access to network shares</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>13</Order> - <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine> - <Description>Install VirtIO drivers</Description> - </SynchronousCommand> </FirstLogonCommands> </component> </settings> diff --git a/assets/win2022-eval.xml b/assets/win2022-eval.xml index 2818bbba5..5a2488dbb 100644 --- a/assets/win2022-eval.xml +++ b/assets/win2022-eval.xml @@ -245,7 +245,7 @@ <AutoLogon> <Username>Docker</Username> <Enabled>true</Enabled> - <LogonCount>1</LogonCount> + <LogonCount>65432</LogonCount> <Password> <Value /> <PlainText>true</PlainText> @@ -267,8 +267,8 @@ <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> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> + <Description>Allow guest access to network shares</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>2</Order> @@ -320,16 +320,6 @@ <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\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> - <Description>Allow guest access to network shares</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>13</Order> - <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine> - <Description>Install VirtIO drivers</Description> - </SynchronousCommand> </FirstLogonCommands> </component> </settings> diff --git a/assets/win7x64.xml b/assets/win7x64.xml index a3d30a21d..e9050e5f2 100644 --- a/assets/win7x64.xml +++ b/assets/win7x64.xml @@ -208,7 +208,7 @@ <AutoLogon> <Username>Docker</Username> <Enabled>true</Enabled> - <LogonCount>1</LogonCount> + <LogonCount>65432</LogonCount> <Password> <Value /> <PlainText>true</PlainText> @@ -227,8 +227,8 @@ <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> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> + <Description>Allow guest access to network shares</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>2</Order> @@ -262,29 +262,29 @@ </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>8</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> + <SynchronousCommand wcm:action="add"> + <Order>9</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> + <Order>10</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> + <Order>11</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> + <Order>12</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> diff --git a/assets/win81x64.xml b/assets/win81x64.xml index 9578b9da4..7f39db491 100644 --- a/assets/win81x64.xml +++ b/assets/win81x64.xml @@ -235,7 +235,7 @@ <AutoLogon> <Username>Docker</Username> <Enabled>true</Enabled> - <LogonCount>1</LogonCount> + <LogonCount>65432</LogonCount> <Password> <Value /> <PlainText>true</PlainText> @@ -257,8 +257,8 @@ <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> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> + <Description>Allow guest access to network shares</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>2</Order> @@ -310,16 +310,6 @@ <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\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> - <Description>Allow guest access to network shares</Description> - </SynchronousCommand> - <SynchronousCommand wcm:action="add"> - <Order>13</Order> - <CommandLine>msiexec /i E:\virtio-win-gt-x64.msi /qb!</CommandLine> - <Description>Install VirtIO drivers</Description> - </SynchronousCommand> </FirstLogonCommands> </component> </settings> diff --git a/assets/winvistax64.xml b/assets/winvistax64.xml index b8f0daea0..06ceea7e9 100644 --- a/assets/winvistax64.xml +++ b/assets/winvistax64.xml @@ -148,7 +148,7 @@ <AutoLogon> <Username>Docker</Username> <Enabled>true</Enabled> - <LogonCount>1</LogonCount> + <LogonCount>65432</LogonCount> <Password> <Value /> <PlainText>true</PlainText> @@ -166,8 +166,8 @@ <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> + <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /v "AllowInsecureGuestAuth" /t REG_DWORD /d 1 /f</CommandLine> + <Description>Allow guest access to network shares</Description> </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>2</Order> @@ -201,29 +201,29 @@ </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>8</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> + <SynchronousCommand wcm:action="add"> + <Order>9</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> + <Order>10</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> + <Order>11</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> + <Order>12</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> <SynchronousCommand wcm:action="add"> <Order>13</Order> <CommandLine>netsh.exe advfirewall firewall set rule group="Remote Desktop" new enable=Yes</CommandLine> diff --git a/src/install.sh b/src/install.sh index 37f6aacbe..e37346a2b 100644 --- a/src/install.sh +++ b/src/install.sh @@ -826,7 +826,7 @@ prepareXP() { echo "AdminPassword=*" echo "TimeZone=0" echo "AutoLogon=Yes" - echo "AutoLogonCount=99999" + echo "AutoLogonCount=65432" echo "" echo "[UserData]" echo "FullName=\"Docker\"" diff --git a/src/samba.sh b/src/samba.sh index 03d1e8b4c..6286492a7 100644 --- a/src/samba.sh +++ b/src/samba.sh @@ -58,6 +58,6 @@ SAMBA="/etc/samba/smb.conf" } | unix2dos > "$SHARE/readme.txt" smbd -D -wsdd -i dockerbridge -p -n "host.local" & +wsdd -i dockerbridge -p -n "host.lan" & return 0