From: longpanda Date: Wed, 23 Aug 2023 01:26:53 +0000 (+0800) Subject: 1.0.95 release X-Git-Tag: v1.0.95 X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/commitdiff_plain/c8dc36a5c3bb042d92a04304caaa7fa7249d9d2e?ds=sidebyside 1.0.95 release --- diff --git a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_linux.c b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_linux.c index c3548e8..93ebeb9 100644 --- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_linux.c +++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_linux.c @@ -1099,6 +1099,7 @@ static grub_err_t ventoy_linux_locate_initrd(int filt, int *filtcnt) if (filtbysize && (NULL == grub_strstr(node->name, "minirt.gz")) && (NULL == grub_strstr(node->name, "initrd.xz")) + && (NULL == grub_strstr(node->name, "initrd.gz")) ) { if (filt > 0 && file->size <= g_ventoy_cpio_size + 2048) diff --git a/IMG/cpio/ventoy/hook/debian/puppy-disk.sh b/IMG/cpio/ventoy/hook/debian/puppy-disk.sh index 600088a..17c715f 100644 --- a/IMG/cpio/ventoy/hook/debian/puppy-disk.sh +++ b/IMG/cpio/ventoy/hook/debian/puppy-disk.sh @@ -37,12 +37,20 @@ ventoy_os_install_dmsetup_by_fuse() { mount -t iso9660 $VTOY_PATH/mnt/fuse/ventoy.iso $VTOY_PATH/mnt/iso - sfsfile=$(ls $VTOY_PATH/mnt/iso/*.sfs) + if ls $VTOY_PATH/mnt/iso/zdrv_*.sfs 2>/dev/null; then + sfsfile=$(ls $VTOY_PATH/mnt/iso/zdrv_*.sfs) + else + sfsfile=$(ls $VTOY_PATH/mnt/iso/*.sfs) + fi mount -t squashfs $sfsfile $VTOY_PATH/mnt/squashfs kVer=$(uname -r) KoName=$(ls $VTOY_PATH/mnt/squashfs/lib/modules/$kVer/kernel/drivers/md/dm-mod.ko*) + if [ -z "$KoName" ]; then + KoName=$(ls $VTOY_PATH/mnt/squashfs/usr/lib/modules/$kVer/kernel/drivers/md/dm-mod.ko*) + fi + vtlog "insmod $KoName" insmod $KoName diff --git a/INSTALL/grub/arm64-efi/moddep.lst b/INSTALL/grub/arm64-efi/moddep.lst index 7ec5308..c3cca20 100644 Binary files a/INSTALL/grub/arm64-efi/moddep.lst and b/INSTALL/grub/arm64-efi/moddep.lst differ diff --git a/INSTALL/grub/arm64-efi/normal.mod b/INSTALL/grub/arm64-efi/normal.mod index a1238fb..bac443a 100644 Binary files a/INSTALL/grub/arm64-efi/normal.mod and b/INSTALL/grub/arm64-efi/normal.mod differ diff --git a/INSTALL/grub/arm64-efi/syslinuxcfg.mod b/INSTALL/grub/arm64-efi/syslinuxcfg.mod index f9331a6..90192c3 100644 Binary files a/INSTALL/grub/arm64-efi/syslinuxcfg.mod and b/INSTALL/grub/arm64-efi/syslinuxcfg.mod differ diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index c7c25b7..dca5525 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -2285,6 +2285,8 @@ function img_common_menuentry { if [ -z "$vtImgHd1Label" ]; then if [ -d (vtimghd,2)/efi ]; then vt_get_fs_label (vtimghd,3) vtImgHd3Label + elif [ -d (vtimghd,12)/efi ]; then + vt_get_fs_label (vtimghd,3) vtImgHd3Label fi fi @@ -2395,7 +2397,7 @@ function mimg_common_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.94" +set VENTOY_VERSION="1.0.95" #ACPI not compatible with Window7/8, so disable by default set VTOY_PARAM_NO_ACPI=1 diff --git a/INSTALL/grub/i386-efi/moddep.lst b/INSTALL/grub/i386-efi/moddep.lst index f099454..b025ad7 100644 --- a/INSTALL/grub/i386-efi/moddep.lst +++ b/INSTALL/grub/i386-efi/moddep.lst @@ -201,7 +201,7 @@ cbmemc: cbtable normal terminfo hfsplus: fshelp gcry_cast5: crypto extcmd: -squash4: fshelp lzopio zfs xzio gzio +squash4: fshelp zstd lzopio zfs xzio gzio part_plan: minix_be: gcry_whirlpool: crypto diff --git a/INSTALL/grub/i386-efi/normal.mod b/INSTALL/grub/i386-efi/normal.mod index abd1ca6..cc5e1fd 100644 Binary files a/INSTALL/grub/i386-efi/normal.mod and b/INSTALL/grub/i386-efi/normal.mod differ diff --git a/INSTALL/grub/i386-efi/syslinuxcfg.mod b/INSTALL/grub/i386-efi/syslinuxcfg.mod index 73c6911..15561f7 100644 Binary files a/INSTALL/grub/i386-efi/syslinuxcfg.mod and b/INSTALL/grub/i386-efi/syslinuxcfg.mod differ diff --git a/INSTALL/grub/i386-pc/moddep.lst b/INSTALL/grub/i386-pc/moddep.lst index 81bfd0a..de15670 100644 --- a/INSTALL/grub/i386-pc/moddep.lst +++ b/INSTALL/grub/i386-pc/moddep.lst @@ -83,7 +83,7 @@ gfxterm_background: video_colors bitmap_scale gfxterm extcmd video bitmap search_fs_uuid: gcry_dsa: pgp mpi keystatus: extcmd -linux: ventoy verifiers normal vbe video boot relocator mmap +linux: ventoy verifiers vbe normal video boot relocator mmap geli: cryptodisk crypto gcry_sha512 pbkdf2 gcry_sha256 cmdline_cat_test: font functional_test normal procfs video_fb rdmsr: extcmd @@ -124,7 +124,7 @@ crypto: part_bsd: part_msdos cs5536: pci biosdisk: -ventoy: ext2 fshelp elf btrfs crypto font gcry_md5 exfat udf div extcmd datetime normal video gcry_sha1 iso9660 acpi +ventoy: ext2 fshelp elf btrfs crypto font gcry_md5 exfat udf div extcmd datetime normal video gcry_sha1 iso9660 reboot acpi lsapm: gcry_sha512: crypto password: crypto normal @@ -208,7 +208,7 @@ cmosdump: hfsplus: fshelp gcry_cast5: crypto extcmd: -squash4: fshelp lzopio zfs xzio gzio +squash4: fshelp zstd lzopio zfs xzio gzio part_plan: minix_be: gcry_whirlpool: crypto diff --git a/INSTALL/grub/i386-pc/syslinuxcfg.mod b/INSTALL/grub/i386-pc/syslinuxcfg.mod index 3f3252b..4369cbe 100644 Binary files a/INSTALL/grub/i386-pc/syslinuxcfg.mod and b/INSTALL/grub/i386-pc/syslinuxcfg.mod differ diff --git a/INSTALL/grub/mips64el-efi/moddep.lst b/INSTALL/grub/mips64el-efi/moddep.lst index 1b5cc71..427a4b0 100644 Binary files a/INSTALL/grub/mips64el-efi/moddep.lst and b/INSTALL/grub/mips64el-efi/moddep.lst differ diff --git a/INSTALL/grub/mips64el-efi/normal.mod b/INSTALL/grub/mips64el-efi/normal.mod index 6a954a7..8c4f138 100644 Binary files a/INSTALL/grub/mips64el-efi/normal.mod and b/INSTALL/grub/mips64el-efi/normal.mod differ diff --git a/INSTALL/grub/mips64el-efi/syslinuxcfg.mod b/INSTALL/grub/mips64el-efi/syslinuxcfg.mod index f272166..2271802 100644 Binary files a/INSTALL/grub/mips64el-efi/syslinuxcfg.mod and b/INSTALL/grub/mips64el-efi/syslinuxcfg.mod differ diff --git a/INSTALL/grub/x86_64-efi/moddep.lst b/INSTALL/grub/x86_64-efi/moddep.lst index 2f03bb9..afdc0e0 100644 --- a/INSTALL/grub/x86_64-efi/moddep.lst +++ b/INSTALL/grub/x86_64-efi/moddep.lst @@ -26,7 +26,7 @@ sfs: fshelp reiserfs: fshelp part_sunpc: zstd: -gfxmenu: video_colors trig gfxterm bitmap_scale font normal video bitmap +gfxmenu: video_colors trig bitmap_scale gfxterm font normal video bitmap backtrace: jfs: help: extcmd normal @@ -121,7 +121,7 @@ ehci: cs5536 usb boot crypto: part_bsd: part_msdos cs5536: -ventoy: ext2 fshelp elf btrfs font crypto gcry_md5 exfat udf div extcmd datetime normal video gcry_sha1 mmap iso9660 +ventoy: ext2 fshelp elf btrfs crypto font gcry_md5 exfat udf datetime div extcmd normal video gcry_sha1 mmap iso9660 gcry_sha512: crypto password: crypto normal fshelp: @@ -202,7 +202,7 @@ cbmemc: cbtable normal terminfo hfsplus: fshelp gcry_cast5: crypto extcmd: -squash4: fshelp lzopio zfs xzio gzio +squash4: fshelp zstd lzopio zfs xzio gzio part_plan: minix_be: gcry_whirlpool: crypto diff --git a/INSTALL/grub/x86_64-efi/normal.mod b/INSTALL/grub/x86_64-efi/normal.mod index fa921eb..3c91f88 100644 Binary files a/INSTALL/grub/x86_64-efi/normal.mod and b/INSTALL/grub/x86_64-efi/normal.mod differ diff --git a/INSTALL/grub/x86_64-efi/syslinuxcfg.mod b/INSTALL/grub/x86_64-efi/syslinuxcfg.mod index 971c209..020f9cf 100644 Binary files a/INSTALL/grub/x86_64-efi/syslinuxcfg.mod and b/INSTALL/grub/x86_64-efi/syslinuxcfg.mod differ diff --git a/LANGUAGES/languages.json b/LANGUAGES/languages.json index d873630..5a489a8 100644 --- a/LANGUAGES/languages.json +++ b/LANGUAGES/languages.json @@ -588,7 +588,7 @@ "name":"Portuguese Brazilian (Português Brasileiro)", "FontFamily":"Courier New", "FontSize":16, - "Author":"EstevaoCostaG3, David BrazSan, Hildo Guillardi Júnior, Chrystian Rubio", Felipe + "Author":"EstevaoCostaG3, David BrazSan, Hildo Guillardi Júnior, Chrystian Rubio, Felipe", "STR_ERROR":"Erro", "STR_WARNING":"Aviso", @@ -605,7 +605,7 @@ "STR_INSTALL_TIP":"O dispositivo será formatado e todos os dados serão perdidos.#@Continuar?", "STR_INSTALL_TIP2":"O dispositivo será formatado e todos os dados serão perdidos.#@Continuar? (Verificação Dupla)", "STR_INSTALL_SUCCESS":"Parabéns!#@O Ventoy foi instalado com sucesso no dispositivo.", - "STR_INSTALL_FAILED":"Um erro ocorreu durante a instalação. Você pode re-inserir o dispositivo USB e tentar de novo. Verifique o log.txt para mais detalhes. Se ele sempre falha por favor refira-se ao FAQ no site oficial da web." + "STR_INSTALL_FAILED":"Um erro ocorreu durante a instalação. Você pode re-inserir o dispositivo USB e tentar de novo. Verifique o log.txt para mais detalhes. Se ele sempre falha por favor refira-se ao FAQ no site oficial da web.", "STR_UPDATE_SUCCESS":"Parabéns!#@O Ventoy foi atualizado com sucesso no dispositivo.", "STR_UPDATE_FAILED":"Um erro ocorreu durante a atualização. Você pode re-inserir o dispositivo USB e tentar de novo. Verifique o log.txt para mais detalhes. Se ele sempre falha por favor refira-se ao FAQ no site oficial da web.", "STR_WAIT_PROCESS":"Um thread está em execução, por favor espere...",