From 2fcb6d2a9cda4deee726bb26e15de9f3bd0b6634 Mon Sep 17 00:00:00 2001
From: bin456789 <bin456789@gmail.com>
Date: Thu, 28 Sep 2023 23:51:30 +0800
Subject: [PATCH] =?UTF-8?q?windows:=20=E4=BD=BF=E7=94=A8=E6=96=B0=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E7=BB=95=E8=BF=87=20win11=20=E7=A1=AC=E4=BB=B6?=
 =?UTF-8?q?=E8=A6=81=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 trans.sh    |  9 +++++++++
 windows.xml | 23 ++++-------------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/trans.sh b/trans.sh
index e5c551f..844d25e 100644
--- a/trans.sh
+++ b/trans.sh
@@ -1240,6 +1240,15 @@ install_windows() {
         echo $image_name | grep -iEw '^Windows (7|Server 2008 R2)'
     }
 
+    is_win11() {
+        echo $image_name | grep -iEw '^Windows 11'
+    }
+
+    # 跳过 win11 硬件限制
+    if is_win11; then
+        wiminfo "$install_wim" "$image_name" --image-property WINDOWS/INSTALLATIONTYPE=Server
+    fi
+
     # 变量名     使用场景
     # arch_uname uname -m                      x86_64  aarch64
     # arch_wim   wiminfo                  x86  x86_64  ARM64
diff --git a/windows.xml b/windows.xml
index 66f3f08..ac80929 100644
--- a/windows.xml
+++ b/windows.xml
@@ -36,28 +36,13 @@
                     </InstallTo>
                 </OSImage>
             </ImageInstall>
-            <RunSynchronous>
+            <!-- 有的机器不起作用 -->
+            <!-- <RunSynchronous>
                 <RunSynchronousCommand wcm:action="add">
                     <Order>1</Order>
-                    <Path>reg add HKLM\System\Setup\LabConfig /v BypassTPMCheck /t reg_dword /d 0x00000001 /f</Path>
+                    <Path>cmd /c for %a in (CPU RAM SecureBoot Storage TPM) do reg add HKLM\SYSTEM\Setup\LabConfig /t REG_DWORD /v Bypass%aCheck /d 1 /f</Path>
                 </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>2</Order>
-                    <Path>reg add HKLM\System\Setup\LabConfig /v BypassSecureBootCheck /t reg_dword /d 0x00000001 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>3</Order>
-                    <Path>reg add HKLM\System\Setup\LabConfig /v BypassRAMCheck /t reg_dword /d 0x00000001 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>4</Order>
-                    <Path>reg add HKLM\System\Setup\LabConfig /v BypassStorageCheck /t reg_dword /d 0x00000001 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>5</Order>
-                    <Path>reg add HKLM\System\Setup\LabConfig /v BypassCPUCheck /t reg_dword /d 0x00000001 /f</Path>
-                </RunSynchronousCommand>
-            </RunSynchronous>
+            </RunSynchronous> -->
         </component>
         <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="%arch%" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <InputLocale>%locale%</InputLocale>