]> glassweightruler.freedombox.rocks Git - Ventoy.git/commitdiff
Support 2k10 PE x86 series
authorlongpanda <admin@ventoy.net>
Sun, 15 Aug 2021 16:39:26 +0000 (00:39 +0800)
committerlongpanda <admin@ventoy.net>
Sun, 15 Aug 2021 16:39:26 +0000 (00:39 +0800)
INSTALL/grub/grub.cfg
INSTALL/ventoy/vtoyjump32.exe
INSTALL/ventoy/vtoyjump64.exe
vtoyjump/vtoyjump/vtoyjump.c

index ac651304e72f44cad59fbd54aaa1063daa8fb102..dc3f64643543b265ec16a07e7e67758dc0ff73ef 100644 (file)
@@ -164,7 +164,11 @@ function distro_specify_wim_patch {
         vt_windows_collect_wim_patch wim /BOOT/H3_7PE.WIM
         vt_windows_collect_wim_patch wim /BOOT/H3_8PE.WIM
         vt_windows_collect_wim_patch wim /BOOT/H3_81PE.WIM
         vt_windows_collect_wim_patch wim /BOOT/H3_7PE.WIM
         vt_windows_collect_wim_patch wim /BOOT/H3_8PE.WIM
         vt_windows_collect_wim_patch wim /BOOT/H3_81PE.WIM
-    fi    
+    elif [ -d (loop)/2k10/winpe ]; then
+        vt_windows_collect_wim_patch wim /2k10/winpe/w1086pe.wim
+        vt_windows_collect_wim_patch wim /2k10/winpe/w8x86pe.wim
+        vt_windows_collect_wim_patch wim /2k10/winpe/w7x86pe.wim
+    fi  
 }
 
 function distro_specify_wim_patch_phase2 {
 }
 
 function distro_specify_wim_patch_phase2 {
index 347cd65c0574c8a3ba942d41554053b476228840..82fe2ed1b6498cf34ddc93fc4966d794b3f610fe 100644 (file)
Binary files a/INSTALL/ventoy/vtoyjump32.exe and b/INSTALL/ventoy/vtoyjump32.exe differ
index caa41c4d2cb560ec479578262f56f93c52c5175f..63659aa70cbaee206feed21a95c2eb1afccd4360 100644 (file)
Binary files a/INSTALL/ventoy/vtoyjump64.exe and b/INSTALL/ventoy/vtoyjump64.exe differ
index 9f6443ec4c1c3c1b89324aa78f4058a7b2d827e2..f4cdd4090c1c422095bd1b526f785669bf01f465 100644 (file)
@@ -713,7 +713,7 @@ static BOOL Is2K10PE(void)
        memset(szLine, 0, sizeof(szLine));\r
        while (fgets(szLine, sizeof(szLine) - 1, fp))\r
        {\r
        memset(szLine, 0, sizeof(szLine));\r
        while (fgets(szLine, sizeof(szLine) - 1, fp))\r
        {\r
-               if (strstr(szLine, "\\2k10\\"))\r
+               if (strstr(szLine, "2k10\\"))\r
                {\r
                        bRet = TRUE;\r
                        break;\r
                {\r
                        bRet = TRUE;\r
                        break;\r