MyFavMirrors
/
Ventoy
mirror of https://github.com/ventoy/Ventoy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

misc update

This commit is contained in:
longpanda 2021-08-18 23:00:11 +08:00
parent 3c01eec4af
commit 92db873b5c
6 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/VentoyProtocol.c
View File

@ -1138,14 +1138,15 @@ EFI_STATUS EFIAPI ventoy_install_blockio(IN EFI_HANDLE ImageHandle, IN UINT64 Im
{ {
gBlockData.Media.BlockSize = 512; gBlockData.Media.BlockSize = 512;
gBlockData.Media.LastBlock = ImgSize / 512 - 1; gBlockData.Media.LastBlock = ImgSize / 512 - 1;
gBlockData.Media.ReadOnly = FALSE;
} }
else else
{ {
gBlockData.Media.BlockSize = 2048; gBlockData.Media.BlockSize = 2048;
gBlockData.Media.LastBlock = ImgSize / 2048 - 1; gBlockData.Media.LastBlock = ImgSize / 2048 - 1;
gBlockData.Media.ReadOnly = TRUE;
} }
gBlockData.Media.ReadOnly = TRUE;
gBlockData.Media.MediaPresent = 1; gBlockData.Media.MediaPresent = 1;
gBlockData.Media.LogicalBlocksPerPhysicalBlock = 1; gBlockData.Media.LogicalBlocksPerPhysicalBlock = 1;

18
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_linux.c
View File

@ -1501,20 +1501,20 @@ grub_err_t ventoy_cmd_linux_chain_data(grub_extcmd_context_t ctxt, int argc, cha
isosize = file->size; isosize = file->size;
boot_catlog = ventoy_get_iso_boot_catlog(file); len = (int)grub_strlen(args[0]);
if (boot_catlog) if (len >= 4 && 0 == grub_strcasecmp(args[0] + len - 4, ".img"))
{ {
if (ventoy_is_efi_os() && (!ventoy_has_efi_eltorito(file, boot_catlog))) debug("boot catlog %u for img file\n", boot_catlog);
{
grub_env_set("LoadIsoEfiDriver", "on");
}
} }
else else
{ {
len = (int)grub_strlen(args[0]); boot_catlog = ventoy_get_iso_boot_catlog(file);
if (len >= 4 && 0 == grub_strcasecmp(args[0] + len - 4, ".img")) if (boot_catlog)
{ {
debug("boot catlog %u for img file\n", boot_catlog); if (ventoy_is_efi_os() && (!ventoy_has_efi_eltorito(file, boot_catlog)))
{
grub_env_set("LoadIsoEfiDriver", "on");
}
} }
else else
{ {

2
GRUB2/MOD_SRC/grub-2.04/install.sh
View File

@ -97,6 +97,8 @@ elif [ "$1" = "arm64" ]; then
if ! echo $all_modules | grep -q " ${line%.mod} "; then if ! echo $all_modules | grep -q " ${line%.mod} "; then
echo "Copy $line ..." echo "Copy $line ..."
cp -a $VT_DIR/GRUB2/INSTALL/lib/grub/arm64-efi/$line $VT_DIR/INSTALL/grub/arm64-efi/ cp -a $VT_DIR/GRUB2/INSTALL/lib/grub/arm64-efi/$line $VT_DIR/INSTALL/grub/arm64-efi/
xz $VT_DIR/INSTALL/grub/arm64-efi/$line
mv $VT_DIR/INSTALL/grub/arm64-efi/${line}.xz $VT_DIR/INSTALL/grub/arm64-efi/${line}
fi fi
done done
elif [ "$1" = "mips64el" ]; then elif [ "$1" = "mips64el" ]; then

1
INSTALL/grub/grub.cfg
View File

@ -1758,6 +1758,7 @@ function legacy_img_memdisk {
function img_common_menuentry { function img_common_menuentry {
set ventoy_compatible=YES set ventoy_compatible=YES
set ventoy_busybox_ver=32 set ventoy_busybox_ver=32
unset LoadIsoEfiDriver
vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_img_path vt_chosen_path vt_chosen_size

2
INSTALL/tool/ventoy_lib.sh
View File

@ -320,7 +320,7 @@ EOF
for i in 0 1 2 3 4 5 6 7 8 9; do for i in 0 1 2 3 4 5 6 7 8 9; do
check_umount_disk "$PART2" check_umount_disk "$PART2"
if mkfs.vfat -F 16 -n VTOYEFI $PART2; then if mkfs.vfat -F 16 -n VTOYEFI -s 1 $PART2; then
echo 'success' echo 'success'
break break
else else

10
INSTALL/ventoy_pack.sh
View File

@ -77,9 +77,13 @@ cp $OPT ./tool/ENROLL_THIS_KEY_IN_MOKMANAGER.cer $tmpmnt/
mkdir -p $tmpmnt/tool mkdir -p $tmpmnt/tool
cp $OPT ./tool/i386/mount.exfat-fuse $tmpmnt/tool/mount.exfat-fuse_i386 # cp $OPT ./tool/i386/mount.exfat-fuse $tmpmnt/tool/mount.exfat-fuse_i386
cp $OPT ./tool/x86_64/mount.exfat-fuse $tmpmnt/tool/mount.exfat-fuse_x86_64 # cp $OPT ./tool/x86_64/mount.exfat-fuse $tmpmnt/tool/mount.exfat-fuse_x86_64
cp $OPT ./tool/aarch64/mount.exfat-fuse $tmpmnt/tool/mount.exfat-fuse_aarch64 # cp $OPT ./tool/aarch64/mount.exfat-fuse $tmpmnt/tool/mount.exfat-fuse_aarch64
# to save space
cp $OPT ./tool/i386/vtoygpt $tmpmnt/tool/mount.exfat-fuse_i386
cp $OPT ./tool/x86_64/vtoygpt $tmpmnt/tool/mount.exfat-fuse_x86_64
cp $OPT ./tool/aarch64/vtoygpt $tmpmnt/tool/mount.exfat-fuse_aarch64
rm -f $tmpmnt/grub/i386-pc/*.img rm -f $tmpmnt/grub/i386-pc/*.img