Changeset 92795 in vbox for trunk/src/VBox

Timestamp:

Dec 7, 2021 10:58:10 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

148714

Message:

Unattended: Previous fix made reg.exe unhappy, it wants the /f option in a very specific place.

Location:

trunk/src/VBox/Main/UnattendedTemplates

Files:

• win_nt6_unattended.xml (modified) (2 diffs)
• win_postinstall.cmd (modified) (1 diff)

trunk/src/VBox/Main/UnattendedTemplates/win_nt6_unattended.xml

@@ -130 +130 @@
                 <RunAsynchronousCommand>
                     <Order>1</Order>
-                    <Path>reg.exe ADD /f HKLM\SYSTEM\Setup\LabConfig /v BypassCPUCheck /t REG_DWORD /d 1</Path>
+                    <Path>reg.exe ADD HKLM\SYSTEM\Setup\LabConfig /v BypassCPUCheck /t REG_DWORD /d 1 /f</Path>
                     <Description>Windows 11 disable CPU check</Description>
                 </RunAsynchronousCommand>
                 <RunAsynchronousCommand>
                     <Order>2</Order>
-                    <Path>reg.exe ADD /f HKLM\SYSTEM\Setup\LabConfig /v BypassRAMCheck /t REG_DWORD /d 1</Path>
+                    <Path>reg.exe ADD HKLM\SYSTEM\Setup\LabConfig /v BypassRAMCheck /t REG_DWORD /d 1 /f</Path>
                     <Description>Windows 11 disable RAM check</Description>
                 </RunAsynchronousCommand>
                 <RunAsynchronousCommand>
                     <Order>3</Order>
-                    <Path>reg.exe ADD /f HKLM\SYSTEM\Setup\LabConfig /v BypassSecureBootCheck /t REG_DWORD /d 1</Path>
+                    <Path>reg.exe ADD HKLM\SYSTEM\Setup\LabConfig /v BypassSecureBootCheck /t REG_DWORD /d 1 /f</Path>
                     <Description>Windows 11 disable Secure Boot check</Description>
                 </RunAsynchronousCommand>
                 <RunAsynchronousCommand>
                     <Order>4</Order>
-                    <Path>reg.exe ADD /f HKLM\SYSTEM\Setup\LabConfig /v BypassStorageCheck /t REG_DWORD /d 1</Path>
+                    <Path>reg.exe ADD HKLM\SYSTEM\Setup\LabConfig /v BypassStorageCheck /t REG_DWORD /d 1 /f</Path>
                     <Description>Windows 11 disable Storage check</Description>
                 </RunAsynchronousCommand>
                 <RunAsynchronousCommand>
                     <Order>5</Order>
-                    <Path>reg.exe ADD /f HKLM\SYSTEM\Setup\LabConfig /v BypassTPMCheck /t REG_DWORD /d 1</Path>
+                    <Path>reg.exe ADD HKLM\SYSTEM\Setup\LabConfig /v BypassTPMCheck /t REG_DWORD /d 1 /f</Path>
                     <Description>Windows 11 disable TPM check</Description>
                 </RunAsynchronousCommand>
@@ -175 +175 @@
                 <RunAsynchronousCommand>
                     <Order>1</Order>
-                    <Path>reg.exe ADD /f HKLM\SYSTEM\Setup\LabConfig /v BypassCPUCheck /t REG_DWORD /d 1</Path>
+                    <Path>reg.exe ADD HKLM\SYSTEM\Setup\LabConfig /v BypassCPUCheck /t REG_DWORD /d 1 /f</Path>
                     <Description>Windows 11 disable CPU check</Description>
                 </RunAsynchronousCommand>
                 <RunAsynchronousCommand>
                     <Order>2</Order>
-                    <Path>reg.exe ADD /f HKLM\SYSTEM\Setup\LabConfig /v BypassRAMCheck /t REG_DWORD /d 1</Path>
+                    <Path>reg.exe ADD HKLM\SYSTEM\Setup\LabConfig /v BypassRAMCheck /t REG_DWORD /d 1 /f</Path>
                     <Description>Windows 11 disable RAM check</Description>
                 </RunAsynchronousCommand>
                 <RunAsynchronousCommand>
                     <Order>3</Order>
-                    <Path>reg.exe ADD /f HKLM\SYSTEM\Setup\LabConfig /v BypassSecureBootCheck /t REG_DWORD /d 1</Path>
+                    <Path>reg.exe ADD HKLM\SYSTEM\Setup\LabConfig /v BypassSecureBootCheck /t REG_DWORD /d 1 /f</Path>
                     <Description>Windows 11 disable Secure Boot check</Description>
                 </RunAsynchronousCommand>
                 <RunAsynchronousCommand>
                     <Order>4</Order>
-                    <Path>reg.exe ADD /f HKLM\SYSTEM\Setup\LabConfig /v BypassStorageCheck /t REG_DWORD /d 1</Path>
+                    <Path>reg.exe ADD HKLM\SYSTEM\Setup\LabConfig /v BypassStorageCheck /t REG_DWORD /d 1 /f</Path>
                     <Description>Windows 11 disable Storage check</Description>
                 </RunAsynchronousCommand>
                 <RunAsynchronousCommand>
                     <Order>5</Order>
-                    <Path>reg.exe ADD /f HKLM\SYSTEM\Setup\LabConfig /v BypassTPMCheck /t REG_DWORD /d 1</Path>
+                    <Path>reg.exe ADD HKLM\SYSTEM\Setup\LabConfig /v BypassTPMCheck /t REG_DWORD /d 1 /f</Path>
                     <Description>Windows 11 disable TPM check</Description>
                 </RunAsynchronousCommand>

trunk/src/VBox/Main/UnattendedTemplates/win_postinstall.cmd

@@ -126 +126 @@
 
 rem Update the registry to autorun the service and make sure we've got autologon.
-echo *** Running: reg.exe ADD /f HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v NTConfiguration /d %SystemDrive%\Apps\vboxtxs.cmd >> %MY_LOG_FILE%
-reg.exe ADD /f HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v NTConfiguration /d %SystemDrive%\Apps\vboxtxs.cmd >> %MY_LOG_FILE% 2>&1
+echo *** Running: reg.exe ADD HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v NTConfiguration /d %SystemDrive%\Apps\vboxtxs.cmd /f >> %MY_LOG_FILE%
+reg.exe ADD HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v NTConfiguration /d %SystemDrive%\Apps\vboxtxs.cmd /f >> %MY_LOG_FILE% 2>&1
 echo *** ERRORLEVEL: %ERRORLEVEL% >> %MY_LOG_FILE%
 
-echo *** Running: reg.exe ADD /f "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v PowerdownAfterShutdown /d 1 >> %MY_LOG_FILE%
-reg.exe ADD /f "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v PowerdownAfterShutdown /d 1 >> %MY_LOG_FILE% 2>&1
+echo *** Running: reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v PowerdownAfterShutdown /d 1 /f >> %MY_LOG_FILE%
+reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v PowerdownAfterShutdown /d 1 /f >> %MY_LOG_FILE% 2>&1
 echo *** ERRORLEVEL: %ERRORLEVEL% >> %MY_LOG_FILE%
 
-echo *** Running: reg.exe ADD /f "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v ForceAutoLogon /d 1 >> %MY_LOG_FILE%
-reg.exe ADD /f "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v ForceAutoLogon /d 1 >> %MY_LOG_FILE% 2>&1
+echo *** Running: reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v ForceAutoLogon /d 1 /f >> %MY_LOG_FILE%
+reg.exe ADD "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v ForceAutoLogon /d 1 /f >> %MY_LOG_FILE% 2>&1
 echo *** ERRORLEVEL: %ERRORLEVEL% >> %MY_LOG_FILE%
 rem  AutoAdminLogon too if administrator?