1.0.28 release

diff --git a/GRUB2/MOD_SRC/grub-2.04/install.sh b/GRUB2/MOD_SRC/grub-2.04/install.sh
index a1251184b99ecc0e05b3b64bd981382e6c9062b9..953244b29b96005a5286d0169e44b2f38bd2417a 100644 (file)
--- a/GRUB2/MOD_SRC/grub-2.04/install.sh
+++ b/GRUB2/MOD_SRC/grub-2.04/install.sh
@@ -12,10 +12,10 @@ make install
 PATH=$PATH:$VT_DIR/GRUB2/INSTALL/bin/:$VT_DIR/GRUB2/INSTALL/sbin/
 
 net_modules_legacy="net tftp http"
 PATH=$PATH:$VT_DIR/GRUB2/INSTALL/bin/:$VT_DIR/GRUB2/INSTALL/sbin/
 
 net_modules_legacy="net tftp http"

-all_modules_legacy="date drivemap blocklist newc vga_text ntldr search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio lspci pci ext2 xfs ventoy chain read halt iso9660 linux16 test true sleep reboot echo videotest videoinfo videotest_checksum video_colors video_cirrus video_bochs vga vbe video_fb font video gettext extcmd terminal  linux minicmd help configfile tr trig boot biosdisk disk ls tar squash4 password_pbkdf2 all_video png jpeg part_gpt part_msdos fat exfat ntfs loopback gzio normal  udf gfxmenu gfxterm gfxterm_background gfxterm_menu"
+all_modules_legacy="date drivemap blocklist regexp newc vga_text ntldr search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio lspci pci ext2 xfs ventoy chain read halt iso9660 linux16 test true sleep reboot echo videotest videoinfo videotest_checksum video_colors video_cirrus video_bochs vga vbe video_fb font video gettext extcmd terminal  linux minicmd help configfile tr trig boot biosdisk disk ls tar squash4 password_pbkdf2 all_video png jpeg part_gpt part_msdos fat exfat ntfs loopback gzio normal  udf gfxmenu gfxterm gfxterm_background gfxterm_menu"

 
 net_modules_uefi="efinet net tftp http"
 
 net_modules_uefi="efinet net tftp http"

-all_modules_uefi="blocklist ventoy test newc search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux relocator jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain  priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop efi_uga video_bochs video_cirrus video video_fb gfxterm_background gfxterm_menu"
+all_modules_uefi="blocklist ventoy test regexp newc search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux relocator jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain  priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop efi_uga video_bochs video_cirrus video video_fb gfxterm_background gfxterm_menu"

 
 if [ "$1" = "uefi" ]; then
     all_modules="$net_modules_uefi $all_modules_uefi "
 
 if [ "$1" = "uefi" ]; then
     all_modules="$net_modules_uefi $all_modules_uefi "

diff --git a/IMG/cpio/ventoy/hook/debian/default-hook.sh b/IMG/cpio/ventoy/hook/debian/default-hook.sh
index e9873d82cb69686ce4df4204dbe8020da6ad9958..4b528320e5644abdc559bf67f770040a2de2d2ce 100644 (file)
--- a/IMG/cpio/ventoy/hook/debian/default-hook.sh
+++ b/IMG/cpio/ventoy/hook/debian/default-hook.sh
@@ -72,5 +72,8 @@ if [ -f /mod.img ] && [ -f /mod/fs/cramfs.ko ]; then
     $BUSYBOX_PATH/rmmod cramfs
 fi
 
     $BUSYBOX_PATH/rmmod cramfs
 fi
 

-
+#for siduction-patience-nox-
+if [ -f /scripts/fll ]; then
+    $SED  "/unset FINGERED/a\\echo '/dev/mapper/ventoy';return;"  -i /scripts/fll
+fi

 
 

diff --git a/IMG/cpio/ventoy/hook/gentoo/ventoy-hook.sh b/IMG/cpio/ventoy/hook/gentoo/ventoy-hook.sh
index e4d90ee7f7c2fbda55aeed8168e21f1a0300b1b0..5ee237ad5c6b396872ebd37082272b3b0b61f25c 100644 (file)
--- a/IMG/cpio/ventoy/hook/gentoo/ventoy-hook.sh
+++ b/IMG/cpio/ventoy/hook/gentoo/ventoy-hook.sh
@@ -21,6 +21,9 @@
 
 if $GREP -q kaspersky /proc/version; then
     $SED "/sysresccd_stage1_normal[^(]*$/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/gentoo/disk_hook.sh"  -i /init
 
 if $GREP -q kaspersky /proc/version; then
     $SED "/sysresccd_stage1_normal[^(]*$/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/gentoo/disk_hook.sh"  -i /init

+    if [ -f /ventoy/ventoy_persistent_map ]; then
+        $SED "/sysresccd_parsecmdline[^(]*$/a\ BACKSTORE_CMD='LABEL=casper-rw,noloop'"  -i /init
+    fi

 elif [ -d /etc/udev/rules.d ] || [ -d /lib/udev/rules.d ]; then    
     ventoy_systemd_udevd_work_around
     ventoy_add_udev_rule "$VTOY_PATH/hook/default/udev_disk_hook.sh %k noreplace"
 elif [ -d /etc/udev/rules.d ] || [ -d /lib/udev/rules.d ]; then    
     ventoy_systemd_udevd_work_around
     ventoy_add_udev_rule "$VTOY_PATH/hook/default/udev_disk_hook.sh %k noreplace"

diff --git a/INSTALL/EFI/BOOT/grubx64_real.efi b/INSTALL/EFI/BOOT/grubx64_real.efi
index 5ed0b688d875848483421130d5729987efe73f13..21649902323a37fa70001e94108ce2be8b237999 100644 (file)
Binary files a/INSTALL/EFI/BOOT/grubx64_real.efi and b/INSTALL/EFI/BOOT/grubx64_real.efi differ

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index bafba8d034ca2d02f85307f73da4bd0c2291ea27..95df45ba6f94eef93e657c29a00f0908659d382b 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -59,7 +59,7 @@ function ventoy_diagnosis {
     configfile $prefix/debug.cfg
 }
 
     configfile $prefix/debug.cfg
 }
 

-function ventoy_localboot {    
+function ventoy_localboot {

     configfile $prefix/localboot.cfg
 }
 
     configfile $prefix/localboot.cfg
 }
 


@@ -270,7 +270,9 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /live/initrd2.img
         vt_linux_specify_initrd_file /install.amd/initrd.gz
         vt_linux_specify_initrd_file /install.amd/gtk/initrd.gz
         vt_linux_specify_initrd_file /live/initrd2.img
         vt_linux_specify_initrd_file /install.amd/initrd.gz
         vt_linux_specify_initrd_file /install.amd/gtk/initrd.gz

-        
+    elif [ -f (loop)/boot/grub/kernels.cfg ]; then
+        vt_linux_parse_initrd_grub  file  (loop)/boot/grub/kernels.cfg
+

     fi
 }
 
     fi
 }
 


@@ -1358,7 +1360,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.27"
+set VENTOY_VERSION="1.0.28"

 
 #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


@@ -1506,6 +1508,34 @@ export vtoy_efi_part
 export VENTOY_VERSION
 export VTOY_CUR_VIDEO_MODE
 
 export VENTOY_VERSION
 export VTOY_CUR_VIDEO_MODE
 

+#special VTOY_DEFAULT_IMAGE process
+if [ -n "$VTOY_DEFAULT_IMAGE" ]; then
+    if regexp --set 1:vtHotkey --set 2:vtDefault "(F[2-9])>(.*)" "$VTOY_DEFAULT_IMAGE"; then
+    
+        set default="$vtDefault"
+        if [ -z "$VTOY_MENU_TIMEOUT" ]; then
+            set timeout=0
+        else
+            set timeout=$VTOY_MENU_TIMEOUT
+        fi
+        
+        export timeout
+        export default
+        
+        if [ "$vtHotkey" = "F2" ]; then
+            ventoy_power
+        elif [ "$vtHotkey" = "F4" ]; then
+            ventoy_localboot
+        elif [ "$vtHotkey" = "F5" ]; then
+            ventoy_diagnosis
+        elif [ "$vtHotkey" = "F6" ]; then
+            ventoy_ext_menu
+        fi
+        
+        unset timeout
+        unset default
+    fi    
+fi

 
 #colect all image files (iso files)
 set ventoy_img_count=0
 
 #colect all image files (iso files)
 set ventoy_img_count=0

diff --git a/INSTALL/grub/i386-pc/core.img b/INSTALL/grub/i386-pc/core.img
index 9ef0b8f8ab6e0c1ba534f17735a378b28482bd8c..04828f1208b6540793fac023a66fbcc2cf25e36f 100644 (file)
Binary files a/INSTALL/grub/i386-pc/core.img and b/INSTALL/grub/i386-pc/core.img differ

diff --git a/INSTALL/tool/VentoyWorker.sh b/INSTALL/tool/VentoyWorker.sh
index f1d4066386f11d8f4b52f4fd39cc1dc1fc1acd81..c74d3c9cfc1abb8baaae2e5de26cd8b487d607d4 100644 (file)
--- a/INSTALL/tool/VentoyWorker.sh
+++ b/INSTALL/tool/VentoyWorker.sh
@@ -14,10 +14,12 @@ print_usage() {
     echo '   -r SIZE_MB  preserve some space at the bottom of the disk (only for install)'
     echo '   -s          enable secure boot support (default is disabled)'
     echo '   -g          use GPT partition style, default is MBR (only for install)'
     echo '   -r SIZE_MB  preserve some space at the bottom of the disk (only for install)'
     echo '   -s          enable secure boot support (default is disabled)'
     echo '   -g          use GPT partition style, default is MBR (only for install)'

+    echo '   -L          Label of the 1st exfat partition (default is ventoy)'

     echo ''
 }
 
 
     echo ''
 }
 
 

+VTNEW_LABEL='ventoy'

 RESERVE_SIZE_MB=0
 while [ -n "$1" ]; do
     if [ "$1" = "-i" ]; then
 RESERVE_SIZE_MB=0
 while [ -n "$1" ]; do
     if [ "$1" = "-i" ]; then


@@ -31,6 +33,9 @@ while [ -n "$1" ]; do
         SECUREBOOT="YES"
     elif [ "$1" = "-g" ]; then
         VTGPT="YES"
         SECUREBOOT="YES"
     elif [ "$1" = "-g" ]; then
         VTGPT="YES"

+    elif [ "$1" = "-L" ]; then
+        shift
+        VTNEW_LABEL=$1

     elif [ "$1" = "-r" ]; then
         RESERVE_SPACE="YES"
         shift
     elif [ "$1" = "-r" ]; then
         RESERVE_SPACE="YES"
         shift


@@ -248,7 +253,7 @@ if [ "$MODE" = "install" ]; then
     PART1=$(get_disk_part_name $DISK 1)  
     PART2=$(get_disk_part_name $DISK 2)  
 
     PART1=$(get_disk_part_name $DISK 1)  
     PART2=$(get_disk_part_name $DISK 2)  
 

-    $cmd -n ventoy -s $cluster_sectors ${PART1}
+    $cmd -n "$VTNEW_LABEL" -s $cluster_sectors ${PART1}

 
     vtinfo "writing data to disk ..."
     
 
     vtinfo "writing data to disk ..."
     

diff --git a/INSTALL/tool/ventoy_lib.sh b/INSTALL/tool/ventoy_lib.sh
index f72d3fe74074cc0231de6ac2edeccf3c67e138e2..b4bf1db3f59cb60496197b67c9ff60c67aaf3a37 100644 (file)
--- a/INSTALL/tool/ventoy_lib.sh
+++ b/INSTALL/tool/ventoy_lib.sh
@@ -265,7 +265,7 @@ w
 EOF
     fi
    
 EOF
     fi
    

-    udevadm trigger >/dev/null 2>&1
+    udevadm trigger --name-match=$DISK >/dev/null 2>&1

     partprobe >/dev/null 2>&1
     sleep 3
     echo "Done"
     partprobe >/dev/null 2>&1
     sleep 3
     echo "Done"


@@ -362,7 +362,7 @@ format_ventoy_disk_gpt() {
     $vtoygpt -f $DISK
     sync
 
     $vtoygpt -f $DISK
     sync
 

-    udevadm trigger >/dev/null 2>&1
+    udevadm trigger --name-match=$DISK >/dev/null 2>&1

     partprobe >/dev/null 2>&1
     sleep 3
     echo "Done"
     partprobe >/dev/null 2>&1
     sleep 3
     echo "Done"

diff --git a/INSTALL/ventoy/ventoy.cpio b/INSTALL/ventoy/ventoy.cpio
index 7f235a838ec00f9c2633c3ef54854ce93dba5b7f..88fec99c626e6707ad5adf0b759a757c504e805e 100644 (file)
Binary files a/INSTALL/ventoy/ventoy.cpio and b/INSTALL/ventoy/ventoy.cpio differ

diff --git a/INSTALL/ventoy/ventoy_x64.efi b/INSTALL/ventoy/ventoy_x64.efi
index 7d3adf881584e857af10928084c3be5b4bbb9385..7d6b8e233065bee448e1d562e5843878931657b7 100644 (file)
Binary files a/INSTALL/ventoy/ventoy_x64.efi and b/INSTALL/ventoy/ventoy_x64.efi differ

diff --git a/INSTALL/ventoy/vtloopex.cpio b/INSTALL/ventoy/vtloopex.cpio
index 056ce8c128f36763c72c87c1a271d8e2cab450ba..93089fd0c456f3300f9fe298dd94c159c250399a 100644 (file)
Binary files a/INSTALL/ventoy/vtloopex.cpio and b/INSTALL/ventoy/vtloopex.cpio differ

diff --git a/LANGUAGES/languages.ini b/LANGUAGES/languages.ini
index 974889221002d79f2acefe924a956c27b725f3aa..41ec7803d36879d23f4f2a3be9beabc140ee2a94 100644 (file)
Binary files a/LANGUAGES/languages.ini and b/LANGUAGES/languages.ini differ