Merge pull request #333 from AlexKintis/issue-331

Resolution for Issue #331: Successful Fix Implementation
StefanScherer · Apr 18, 2024 · c40bde3 · c40bde3
2 parents 794ff55 + 7dbde41
commit c40bde3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 28 deletions.
diff --git a/answer_files/11/Autounattend.xml b/answer_files/11/Autounattend.xml
@@ -57,6 +57,26 @@
         </component>
 
         <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
+
+            <!-- Run SynchronousCommand at the installation of windows -->
+            <RunSynchronous>
+
+                <!-- Bypass TPM Check -->
+                <RunSynchronousCommand wcm:action="add">
+                    <Description>Bypass TPM Check</Description>
+                    <Order>1</Order>
+                    <Path>reg add HKLM\SYSTEM\Setup\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1 /f</Path>
+                </RunSynchronousCommand>
+
+                <!-- Bypass Secure Boot Check -->
+                <RunSynchronousCommand wcm:action="add">
+                    <Description>Bypass Secure Boot Check</Description>
+                    <Order>2</Order>
+                    <Path>reg add HKLM\SYSTEM\Setup\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1 /f</Path>
+                </RunSynchronousCommand>
+
+            </RunSynchronous>
+
             <DiskConfiguration>
                 <Disk wcm:action="add">
                     <CreatePartitions>

diff --git a/windows_11.json b/windows_11.json
@@ -1,13 +1,7 @@
 {
   "builders": [
     {
-      "boot_command": [
-        "<leftShiftOn><f10><leftShiftOff><wait>",
-        "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>",
-        "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>",
-        "exit<return>",
-        "<wait><return>"
-      ],
+      "boot_command": "",
       "boot_wait": "2m",
       "communicator": "winrm",
       "configuration_version": "8.0",
@@ -35,13 +29,7 @@
       "winrm_username": "vagrant"
     },
     {
-      "boot_command": [
-        "<leftShiftOn><f10><leftShiftOff><wait>",
-        "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>",
-        "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>",
-        "exit<return>",
-        "<wait><return>"
-      ],
+      "boot_command": "",
       "boot_wait": "2m",
       "communicator": "winrm",
       "cpus": 2,
@@ -78,13 +66,7 @@
       "winrm_username": "vagrant"
     },
     {
-      "boot_command": [
-        "<leftShiftOn><f10><leftShiftOff><wait>",
-        "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>",
-        "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>",
-        "exit<return>",
-        "<wait><return>"
-      ],
+      "boot_command": "",
       "boot_wait": "2m",
       "communicator": "winrm",
       "cpus": 2,
@@ -112,13 +94,7 @@
       "winrm_username": "vagrant"
     },
     {
-      "boot_command": [
-        "<leftShiftOn><f10><leftShiftOff><wait>",
-        "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassTPMCheck /d 1<return>",
-        "reg add HKLM\\SYSTEM\\Setup\\LabConfig /t REG_DWORD /v BypassSecureBootCheck /d 1<return><wait>",
-        "exit<return>",
-        "<wait><return>"
-      ],
+      "boot_command": "",
       "boot_wait": "2m",
       "communicator": "winrm",
       "cpus": 2,