Skip to content

Commit 81728a8

Browse files
ventoyventoy
committed
1.1.10 release
1 parent f68d4a8 commit 81728a8

File tree

5 files changed

+134
-25
lines changed

5 files changed

+134
-25
lines changed

‎IMG/cpio/ventoy/ventoy_chain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ ventoy_get_os_type() {
376376
fi
377377
fi
378378
if [ -f /etc/kylin-release ]; then
379-
if $GREP -i -q -m1 'Kylin.*Server.* V11 ' /etc/kylin-release; then
379+
if $GREP -i -q -m1 'Kylin.*Server.* V1[1-9] ' /etc/kylin-release; then
380380
echo 'openEuler'; return
381381
fi
382382
fi

‎INSTALL/grub/grub.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2449,7 +2449,7 @@ function mimg_common_menuentry {
24492449
#############################################################
24502450
#############################################################
24512451

2452-
set VENTOY_VERSION="1.1.09"
2452+
set VENTOY_VERSION="1.1.10"
24532453

24542454
#ACPI not compatible with Window7/8, so disable by default
24552455
set VTOY_PARAM_NO_ACPI=1

‎INSTALL/grub/menu/lg_UG.json‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
{
2+
"VTLANG_LANGUAGE_NAME": "English (English)",
3+
4+
"VTLANG_STR_HOTKEY_LIST": "L:Language F1:Help F2:Browse F3:ListView F4:Localboot F5:Tools F6:ExMenu",
5+
"VTLANG_STR_HOTKEY_TREE": "L:Language F1:Help F2:Browse F3:TreeView F4:Localboot F5:Tools F6:ExMenu",
6+
"VTLANG_RETURN_PREVIOUS": "Return to previous menu [Esc]",
7+
"VTLANG_RETURN_PRV_NOESC": "Return to previous menu",
8+
9+
"VTLANG_MENU_LANG": "Menu Language Select",
10+
11+
"VTLANG_LB_SBOOT_WINDOWS": "Search and boot Windows",
12+
"VTLANG_LB_SBOOT_G4D": "Search and boot Grub4dos",
13+
"VTLANG_LB_SBOOT_HDD1": "Boot the 1st local disk",
14+
"VTLANG_LB_SBOOT_HDD2": "Boot the 2nd local disk",
15+
"VTLANG_LB_SBOOT_HDD3": "Boot the 3rd local disk",
16+
"VTLANG_LB_SBOOT_X64EFI": "Search and boot BOOTX64.EFI",
17+
"VTLANG_LB_SBOOT_IA32EFI": "Search and boot BOOTIA32.EFI",
18+
"VTLANG_LB_SBOOT_AA64EFI": "Search and boot BOOTAA64.EFI",
19+
"VTLANG_LB_SBOOT_XORBOOT": "Search and boot xorboot",
20+
21+
"VTLANG_FILE_CHKSUM": "File checksum",
22+
"VTLANG_CHKSUM_MD5_CALC": "Calculate md5sum",
23+
"VTLANG_CHKSUM_SHA1_CALC": "Calculate sha1sum",
24+
"VTLANG_CHKSUM_SHA256_CALC": "Calculate sha256sum",
25+
"VTLANG_CHKSUM_SHA512_CALC": "Calculate sha512sum",
26+
"VTLANG_CHKSUM_MD5_CALC_CHK": "Calculate and check md5sum",
27+
"VTLANG_CHKSUM_SHA1_CALC_CHK": "Calculate and check sha1sum",
28+
"VTLANG_CHKSUM_SHA256_CALC_CHK": "Calculate and check sha256sum",
29+
"VTLANG_CHKSUM_SHA512_CALC_CHK": "Calculate and check sha512sum",
30+
31+
"VTLANG_POWER": "Power",
32+
"VTLANG_POWER_REBOOT": "Reboot",
33+
"VTLANG_POWER_HALT": "Halt",
34+
"VTLANG_POWER_BOOT_EFIFW": "Reboot to EFI setup",
35+
36+
"VTLANG_KEYBRD_LAYOUT": "Keyboard Layouts",
37+
"VTLANG_HWINFO": "Hardware Information",
38+
39+
"VTLANG_RESOLUTION_CFG": "Resolution Configuration",
40+
"VTLANG_SCREEN_MODE": "Screen Display Mode",
41+
"VTLANG_SCREEN_TEXT_MODE": "Force Text Mode",
42+
"VTLANG_SCREEN_GUI_MODE": "Force Graphics Mode",
43+
44+
"VTLANG_THEME_SELECT": "Theme Select",
45+
46+
"VTLANG_UEFI_UTIL": "Ventoy UEFI Utilities",
47+
"VTLANG_UTIL_SHOW_EFI_DRV": "Show EFI Drivers",
48+
"VTLANG_UTIL_FIX_BLINIT_FAIL": "Fixup Windows BlinitializeLibrary Failure",
49+
50+
"VTLANG_JSON_CHK_JSON": "Check plugin json configuration (ventoy.json)",
51+
"VTLANG_JSON_CHK_CONTROL": "Check global control plugin configuration",
52+
"VTLANG_JSON_CHK_THEME": "Check theme plugin configuration",
53+
"VTLANG_JSON_CHK_AUTOINS": "Check auto install plugin configuration",
54+
"VTLANG_JSON_CHK_PERSIST": "Check persistence plugin configuration",
55+
"VTLANG_JSON_CHK_MENU_ALIAS": "Check menu alias plugin configuration",
56+
"VTLANG_JSON_CHK_MENU_TIP": "Check menu tip plugin configuration",
57+
"VTLANG_JSON_CHK_MENU_CLASS": "Check menu class plugin configuration",
58+
"VTLANG_JSON_CHK_INJECTION": "Check injection plugin configuration",
59+
"VTLANG_JSON_CHK_AUTO_MEMDISK": "Check auto memdisk plugin configuration",
60+
"VTLANG_JSON_CHK_IMG_LIST": "Check image list plugin configuration",
61+
"VTLANG_JSON_CHK_IMG_BLIST": "Check image blacklist plugin configuration",
62+
"VTLANG_JSON_CHK_CONF_REPLACE": "Check boot conf replace plugin configuration",
63+
"VTLANG_JSON_CHK_DUD": "Check dud plugin configuration",
64+
"VTLANG_JSON_CHK_PASSWORD": "Check password plugin configuration",
65+
66+
"VTLANG_NORMAL_MODE": "Boot in normal mode",
67+
"VTLANG_WIMBOOT_MODE": "Boot in wimboot mode",
68+
"VTLANG_GRUB2_MODE": "Boot in grub2 mode",
69+
"VTLANG_MEMDISK_MODE": "Boot in memdisk mode",
70+
71+
"VTLANG_RET_TO_LISTVIEW": "Return to ListView",
72+
"VTLANG_RET_TO_TREEVIEW": "Return to TreeView",
73+
74+
"VTLANG_NO_AUTOINS_SCRIPT": "Boot without auto installation template",
75+
"VTLANG_AUTOINS_USE": "Boot with",
76+
77+
"VTLANG_NO_PERSIST": "Boot without persistence",
78+
"VTLANG_PERSIST_USE": "Boot with",
79+
80+
"VTLANG_BROWER_RETURN": "Return",
81+
82+
"VTLANG_ENTER_EXIT": "press Enter key to exit",
83+
"VTLANG_ENTER_REBOOT": "press Enter key to reboot",
84+
"VTLANG_ENTER_CONTINUE": "press Enter key to continue",
85+
86+
"VTLANG_CTRL_TEMP_SET": "Temporary Control Settings",
87+
"VTLANG_WIN11_BYPASS_CHECK": "Bypass CPU/TPM/SecureBoot check when install Windows 11",
88+
"VTLANG_WIN11_BYPASS_NRO": "Bypass online account requirement when install Windows 11",
89+
"VTLANG_LINUX_REMOUNT": "Mount Ventoy partition after boot Linux",
90+
"VTLANG_SECONDARY_BOOT_MENU": "Show secondary boot menu",
91+
92+
"MENU_STR_XXX": ""
93+
}

‎LANGUAGES/languages.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"STRXXX":""
6666
},
6767
{
68-
"name": "اردو (Urdu)",
68+
"name": "Urdu (اردو)",
6969
"FontFamily": "Noto Nastaliq Urdu",
7070
"FontSize": 16,
7171
"Author": "Muhammad Ramzan",

‎Ventoy2Disk/Ventoy2Disk/PhyDrive.c‎

Lines changed: 38 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2785,6 +2785,40 @@ static BOOL WriteBackupDataToDisk(HANDLE hDrive, UINT64 Offset, BYTE *Data, DWOR
27852785
return TRUE;
27862786
}
27872787

2788+
static int DeleteVtoyEFIMountPoint(int PhyDrive)
2789+
{
2790+
int i = 0;
2791+
BOOL bRet;
2792+
CHAR DriveLetters[MAX_PATH] = { 0 };
2793+
CHAR DriveName[] = "?:\\";
2794+
2795+
Log("Try to delete VtoyEFI mount point for PhyDrive %d\n", PhyDrive);
2796+
2797+
GetLettersBelongPhyDrive(PhyDrive, DriveLetters, sizeof(DriveLetters));
2798+
2799+
if (DriveLetters[0] == 0)
2800+
{
2801+
Log("No drive letter was assigned...");
2802+
}
2803+
else
2804+
{
2805+
// Unmount all mounted volumes that belong to this drive
2806+
// Do it in reverse so that we always end on the first volume letter
2807+
for (i = (int)strlen(DriveLetters); i > 0; i--)
2808+
{
2809+
DriveName[0] = DriveLetters[i - 1];
2810+
if (IsVentoyLogicalDrive(DriveName[0]))
2811+
{
2812+
Log("%s is ventoy logical drive", DriveName);
2813+
bRet = DeleteVolumeMountPointA(DriveName);
2814+
Log("Delete mountpoint %s ret:%u code:%u", DriveName, bRet, LASTERR);
2815+
break;
2816+
}
2817+
}
2818+
}
2819+
2820+
return 0;
2821+
}
27882822

27892823
int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)
27902824
{
@@ -2874,28 +2908,7 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)
28742908
SetFilePointer(hDrive, 512 * 2040, NULL, FILE_BEGIN);
28752909
ReadFile(hDrive, ReservedData, sizeof(ReservedData), &dwSize, NULL);
28762910

2877-
GetLettersBelongPhyDrive(pPhyDrive->PhyDrive, DriveLetters, sizeof(DriveLetters));
2878-
2879-
if (DriveLetters[0] == 0)
2880-
{
2881-
Log("No drive letter was assigned...");
2882-
}
2883-
else
2884-
{
2885-
// Unmount all mounted volumes that belong to this drive
2886-
// Do it in reverse so that we always end on the first volume letter
2887-
for (i = (int)strlen(DriveLetters); i > 0; i--)
2888-
{
2889-
DriveName[0] = DriveLetters[i - 1];
2890-
if (IsVentoyLogicalDrive(DriveName[0]))
2891-
{
2892-
Log("%s is ventoy logical drive", DriveName);
2893-
bRet = DeleteVolumeMountPointA(DriveName);
2894-
Log("Delete mountpoint %s ret:%u code:%u", DriveName, bRet, LASTERR);
2895-
break;
2896-
}
2897-
}
2898-
}
2911+
DeleteVtoyEFIMountPoint(pPhyDrive->PhyDrive);
28992912

29002913
// It kind of blows, but we have to relinquish access to the physical drive
29012914
// for VDS to be able to delete the partitions that reside on it...
@@ -3270,6 +3283,9 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)
32703283
{
32713284
Log("Change EFI partition attr success");
32723285
pPhyDrive->Part2GPTAttr = VENTOY_EFI_PART_ATTR;
3286+
3287+
Sleep(1000);
3288+
DeleteVtoyEFIMountPoint(pPhyDrive->PhyDrive);
32733289
}
32743290
else
32753291
{

0 commit comments

Comments
 (0)