Skip to content

Commit

Permalink
1.0.95 release
Browse files Browse the repository at this point in the history
  • Loading branch information
ventoy committed Aug 23, 2023
1 parent 689f7df commit c8dc36a
Show file tree
Hide file tree
Showing 18 changed files with 22 additions and 11 deletions.
1 change: 1 addition & 0 deletions GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 9 additions & 1 deletion IMG/cpio/ventoy/hook/debian/puppy-disk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Binary file modified INSTALL/grub/arm64-efi/moddep.lst
Binary file not shown.
Binary file modified INSTALL/grub/arm64-efi/normal.mod
Binary file not shown.
Binary file modified INSTALL/grub/arm64-efi/syslinuxcfg.mod
Binary file not shown.
4 changes: 3 additions & 1 deletion INSTALL/grub/grub.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion INSTALL/grub/i386-efi/moddep.lst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified INSTALL/grub/i386-efi/normal.mod
Binary file not shown.
Binary file modified INSTALL/grub/i386-efi/syslinuxcfg.mod
Binary file not shown.
6 changes: 3 additions & 3 deletions INSTALL/grub/i386-pc/moddep.lst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Binary file modified INSTALL/grub/i386-pc/syslinuxcfg.mod
Binary file not shown.
Binary file modified INSTALL/grub/mips64el-efi/moddep.lst
Binary file not shown.
Binary file modified INSTALL/grub/mips64el-efi/normal.mod
Binary file not shown.
Binary file modified INSTALL/grub/mips64el-efi/syslinuxcfg.mod
Binary file not shown.
6 changes: 3 additions & 3 deletions INSTALL/grub/x86_64-efi/moddep.lst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
Binary file modified INSTALL/grub/x86_64-efi/normal.mod
Binary file not shown.
Binary file modified INSTALL/grub/x86_64-efi/syslinuxcfg.mod
Binary file not shown.
4 changes: 2 additions & 2 deletions LANGUAGES/languages.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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...",
Expand Down

0 comments on commit c8dc36a

Please sign in to comment.