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 c3548e84d81185cae610cc63b21c3afd4399b640..93ebeb92a3bfb04643f9a1594d799b99fd6dce11 100644 (file)
--- 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"))
         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)
             )
         {
             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 600088a28ef6bbd9d356da0b303a27c116aa8d87..17c715f8009db153e33c6942ba646438a8953a81 100644 (file)
--- 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
 
 
     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*)
 
     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
 
     vtlog "insmod $KoName"
     insmod $KoName
 

diff --git a/INSTALL/grub/arm64-efi/moddep.lst b/INSTALL/grub/arm64-efi/moddep.lst
index 7ec5308ef6c5184dff7ad4683c17b211c669bd81..c3cca2021f353ee08d4d6f4303cca63f6b523f21 100644 (file)
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 a1238fb89f2b7e1c4b52aab8287d12991041ce68..bac443a46a8ae91869419eb62853d8787f19df07 100644 (file)
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 f9331a60ee5bce3b8542bbd4c20a80cbd52e1736..90192c30833ab2bd2f43a92aae6927ecd85dfe39 100644 (file)
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 c7c25b778f8ef4473ba0d3a12cbcd055a40e73e5..dca5525ca5f265ceb3dc9f7487d3b9b93a3759fe 100644 (file)
--- 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
     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
 
         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
 
 #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 f0994548e1658b5fb8af487fae3722003466ad72..b025ad793d9272a386ad8fa66ae90415f854455b 100644 (file)
--- 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:
 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
 part_plan:
 minix_be:
 gcry_whirlpool: crypto

diff --git a/INSTALL/grub/i386-efi/normal.mod b/INSTALL/grub/i386-efi/normal.mod
index abd1ca600f06f6261958decfc75985b3d847c8ae..cc5e1fd44c3cd2a9da8ce48f71784191d378b224 100644 (file)
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 73c69112d170e3b83d0f254fdc72efad85b7fa53..15561f7e0a8619ca4ca93e828e1b2da3f3a67ada 100644 (file)
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 81bfd0a610f3b08672901f7207568a6499abb5c1..de156703104b53f361241ede5dc36ce06445cfc7 100644 (file)
--- 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
 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
 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:
 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
 lsapm:
 gcry_sha512: crypto
 password: crypto normal


@@ -208,7 +208,7 @@ cmosdump:
 hfsplus: fshelp
 gcry_cast5: crypto
 extcmd:
 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
 part_plan:
 minix_be:
 gcry_whirlpool: crypto

diff --git a/INSTALL/grub/i386-pc/syslinuxcfg.mod b/INSTALL/grub/i386-pc/syslinuxcfg.mod
index 3f3252b2d7ec601eeaee2faad87690b400b604c8..4369cbe1f11432c1d62ed2c6325475413d0d1590 100644 (file)
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 1b5cc71e6bc9fd258473c0e6a4811d316e2db3de..427a4b025a462fa8c51947af3faa8bea7955501e 100644 (file)
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 6a954a7e4466377e99037f069154a918440ae764..8c4f138228c37e1e51780ecba2a028b30b612487 100644 (file)
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 f2721665d116c224bd25666b05f7580183c4e07e..22718020b8906b0ed7fea576775217a78592023a 100644 (file)
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 2f03bb96d2cd1773c5d54f620709c22ee12a4ac2..afdc0e0be921aca73b63fc7755d7370cdcb6de04 100644 (file)
--- 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:
 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
 backtrace:
 jfs:
 help: extcmd normal


@@ -121,7 +121,7 @@ ehci: cs5536 usb boot
 crypto:
 part_bsd: part_msdos
 cs5536:
 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:
 gcry_sha512: crypto
 password: crypto normal
 fshelp:


@@ -202,7 +202,7 @@ cbmemc: cbtable normal terminfo
 hfsplus: fshelp
 gcry_cast5: crypto
 extcmd:
 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
 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 fa921eb50f5e84b97edee76fabeeca8cdf35d7d4..3c91f882de3fadae6a4dbbdc8b1ce3ddc20df031 100644 (file)
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 971c2094c3f8ffc0e8ac2a69a43cbe3e7c3037dc..020f9cfbd4e374cb1a6ee8bebf477ddf258e7a4f 100644 (file)
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 d873630452e477c10c70e6b309cba43442fa4c35..5a489a8a944c7470a0765003e287b5648fb20b2f 100644 (file)
--- a/LANGUAGES/languages.json
+++ b/LANGUAGES/languages.json
@@ -588,7 +588,7 @@
         "name":"Portuguese Brazilian (Português Brasileiro)",
         "FontFamily":"Courier New",
         "FontSize":16,
         "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",
         
         "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_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...",
         "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...",