From 9615e7eaa0cb6d02ac3d94f0bf7d06f3ffc277ed Mon Sep 17 00:00:00 2001 From: longpanda Date: Mon, 16 Aug 2021 00:39:26 +0800 Subject: [PATCH] Support 2k10 PE x86 series --- INSTALL/grub/grub.cfg | 6 +++++- INSTALL/ventoy/vtoyjump32.exe | Bin 114688 -> 114688 bytes INSTALL/ventoy/vtoyjump64.exe | Bin 135168 -> 135168 bytes vtoyjump/vtoyjump/vtoyjump.c | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index ac651304..dc3f6464 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -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 - 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 { diff --git a/INSTALL/ventoy/vtoyjump32.exe b/INSTALL/ventoy/vtoyjump32.exe index 347cd65c0574c8a3ba942d41554053b476228840..82fe2ed1b6498cf34ddc93fc4966d794b3f610fe 100644 GIT binary patch delta 91 zcmZo@U~gz(pYVfen^WVjt-ly=S;%d3l1yX(0wy4K0^%JD7#VhSFoJ{_wmEJ8WXYK1 q$YzvnXb{7&J*t{9iB~{5b?=o2o$;;{{wA#zlW4Ztex`%b#2f%nP##PG delta 91 zcmZo@U~gz(pYVgJ%Chm-)?bXbEaa*zB@-EdfC-45fOy9OMur_7j36O~D$DJkEE$s= q*@d}h@hbq56xx%MCQ2)~_qesuSpXp#UF$VxEDjy91 diff --git a/INSTALL/ventoy/vtoyjump64.exe b/INSTALL/ventoy/vtoyjump64.exe index caa41c4d2cb560ec479578262f56f93c52c5175f..63659aa70cbaee206feed21a95c2eb1afccd4360 100644 GIT binary patch delta 91 zcmZozz|pXPW5Nffbxw_+wtiwf6d||HNivZE2$+D_4Tvw?U}U(kj}auqu+C}wrAWrM rFgBxXLxUKG?Qt6z%lHJge3R;VwvNev=0i=sZmE;~+n?-XlnDd?k*6RN delta 91 zcmZozz|pXPW5NffX3NG;TR$-#ijZrzluTp*0wy4K1L6xe7#S|?V+08?G+S=J6v@~Y q#uj6gZD3${CSU!4(PQWs#i{mDK?nLq%0{~!(k diff --git a/vtoyjump/vtoyjump/vtoyjump.c b/vtoyjump/vtoyjump/vtoyjump.c index 9f6443ec..f4cdd409 100644 --- a/vtoyjump/vtoyjump/vtoyjump.c +++ b/vtoyjump/vtoyjump/vtoyjump.c @@ -713,7 +713,7 @@ static BOOL Is2K10PE(void) memset(szLine, 0, sizeof(szLine)); while (fgets(szLine, sizeof(szLine) - 1, fp)) { - if (strstr(szLine, "\\2k10\\")) + if (strstr(szLine, "2k10\\")) { bRet = TRUE; break;