1.0.10 release

INSTALL/Ventoy2Disk.sh

@@ -9,12 +9,16 @@ fi
 . ./tool/ventoy_lib.sh
 
 print_usage() {
-    echo 'Usage:  VentoyInstaller.sh OPTION /dev/sdX'
-    echo '  OPTION:'
+    echo 'Usage:  Ventoy2Disk.sh CMD [ OPTION ] /dev/sdX'
+    echo '  CMD:'
     echo '   -i  install ventoy to sdX (fail if disk already installed with ventoy)'
     echo '   -u  update ventoy in sdX'
     echo '   -I  force install ventoy to sdX (no matter installed or not)'
     echo ''
+    echo '  OPTION: (optional)'
+    echo '   -s  enable secure boot support (default is disabled)'
+    echo ''
+    
 }
 
 echo ''
@@ -38,6 +42,7 @@ while [ -n "$1" ]; do
         SECUREBOOT="YES"
     else
         if ! [ -b "$1" ]; then
+            vterr "$1 is NOT a valid device"
             print_usage
             cd $OLDDIR
             exit 1
@@ -54,13 +59,25 @@ if [ -z "$MODE" ]; then
     exit 1
 fi
 
-if [ -z "$SUDO_USER" ]; then
-    if [ "$USER" != "root" ]; then
-        vterr "EUID is $EUID root permission is required."
-        echo ''
-        cd $OLDDIR
-        exit 1
-    fi
+if ! [ -b "$DISK" ]; then
+    vterr "Disk $DISK does not exist"
+    cd $OLDDIR
+    exit 1
+fi
+
+if [ -e /sys/class/block/${DISK#/dev/}/start ]; then
+    vterr "$DISK is a partition, please use the whole disk"
+    cd $OLDDIR
+    exit 1
+fi
+
+if dd if="$DISK" of=/dev/null bs=1 count=1 >/dev/null 2>&1; then
+    vtdebug "root permission check ok ..."
+else
+    vterr "Failed to access $DISK, maybe root privilege is needed!"
+    echo ''
+    cd $OLDDIR
+    exit 1
 fi
 
 vtdebug "MODE=$MODE FORCE=$FORCE"
@@ -93,20 +110,6 @@ if ! check_tool_work_ok; then
     exit 1
 fi
 
-
-if ! [ -b "$DISK" ]; then
-    vterr "Disk $DISK does not exist"
-    cd $OLDDIR
-    exit 1
-fi
-
-
-if [ -e /sys/class/block/${DISK#/dev/}/start ]; then
-    vterr "$DISK is a partition, please use the whole disk"
-    cd $OLDDIR
-    exit 1
-fi
-
 grep "^$DISK" /proc/mounts | while read mtline; do
     mtpnt=$(echo $mtline | awk '{print $DISK}')
     vtdebug "Trying to umount $mtpnt ..."
@@ -242,6 +245,7 @@ if [ "$MODE" = "install" ]; then
         rm -f ./tmp_mnt/EFI/BOOT/BOOTX64.EFI
         rm -f ./tmp_mnt/EFI/BOOT/grubx64.efi
         rm -f ./tmp_mnt/EFI/BOOT/MokManager.efi
+        rm -f ./tmp_mnt/ENROLL_THIS_KEY_IN_MOKMANAGER.cer
         mv ./tmp_mnt/EFI/BOOT/grubx64_real.efi  ./tmp_mnt/EFI/BOOT/BOOTX64.EFI
         
         umount ./tmp_mnt
@@ -305,6 +309,7 @@ else
         rm -f ./tmp_mnt/EFI/BOOT/BOOTX64.EFI
         rm -f ./tmp_mnt/EFI/BOOT/grubx64.efi
         rm -f ./tmp_mnt/EFI/BOOT/MokManager.efi
+        rm -f ./tmp_mnt/ENROLL_THIS_KEY_IN_MOKMANAGER.cer
         mv ./tmp_mnt/EFI/BOOT/grubx64_real.efi  ./tmp_mnt/EFI/BOOT/BOOTX64.EFI
         
         umount ./tmp_mnt

INSTALL/grub/grub.cfg

@@ -50,6 +50,21 @@ function get_os_type {
     fi
 }
 
+function vt_check_pe {
+    unset VT_PE_SUPPORT
+
+    if [ -f $1/HBCD_PE.ini ]; then
+        set ventoy_compatible=YES
+        set VT_PE_SUPPORT=YES
+    elif [ -f $1/easyu.flg ]; then
+        set VT_PE_SUPPORT=YES
+    elif [ -f $1/USM.ICO ]; then
+        set VT_PE_SUPPORT=YES
+    elif [ -d $1/USM_TOOL ]; then
+        set VT_PE_SUPPORT=YES
+    fi
+}
+
 function locate_initrd {
     vt_linux_locate_initrd 
 
@@ -62,7 +77,8 @@ function locate_initrd {
 function find_wim_file {
     unset ventoy_wim_file
     
-    for file in "sources/boot.wim" "sources/BOOT.WIM" "Sources/Win10PEx64.WIM" "boot/BOOT.WIM" "winpe_x64.wim"; do
+    for file in "sources/boot.wim" "sources/BOOT.WIM" "Sources/Win10PEx64.WIM" "boot/BOOT.WIM" \
+                "winpe_x64.wim" "boot/10pex64.wim" "BOOT/USM1PE6L.WIM" "BOOT/USM1PE6F.WIM"; do
         if [ -e $1/$file ]; then
             set ventoy_wim_file=$1/$file
             break
@@ -114,6 +130,8 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /isolinux/initramfs
     elif [ -f (loop)/boot/iniramfs.igz ]; then
         vt_linux_specify_initrd_file /boot/iniramfs.igz
+    elif [ -f (loop)/initrd-x86_64 ]; then
+        vt_linux_specify_initrd_file /initrd-x86_64
         
     fi
 }
@@ -248,10 +266,11 @@ function uefi_iso_menu_func {
     vt_img_sector ${1}${chosen_path}
     
     if [ "$vtoy_os" = "Windows" ]; then
-        if [ "$ventoy_fs_probe" = "iso9660" ]; then
-            set ventoy_compatible=YES
-        elif [ -f (loop)/HBCD_PE.ini ]; then
-            set ventoy_compatible=YES
+        vt_check_pe (loop)        
+        if [ "$VT_PE_SUPPORT" != "YES" ]; then
+            if [ "$ventoy_fs_probe" = "iso9660" ]; then        
+                set ventoy_compatible=YES
+            fi
         fi
     
         uefi_windows_menu_func  $1 ${chosen_path}
@@ -293,8 +312,7 @@ function legacy_windows_menu_func {
     fi
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
-        linux16   $vtoy_path/ipxe.krn ${vtdebug_flag} ibft
-        initrd16  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}        
+        linux16   $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else
         echo "chain empty failed"
@@ -349,9 +367,8 @@ function legacy_linux_menu_func {
         sleep 5
     fi
     
-    if [ -n "$vtoy_chain_mem_addr" ]; then        
-        linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}
-        initrd16  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}        
+    if [ -n "$vtoy_chain_mem_addr" ]; then
+        linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else
         echo "chain empty failed"
@@ -389,10 +406,11 @@ function legacy_iso_menu_func {
     vt_img_sector ${1}${chosen_path}
 
     if [ "$vtoy_os" = "Windows" ]; then
-        if [ "$ventoy_fs_probe" = "iso9660" ]; then
-            set ventoy_compatible=YES
-        elif [ -f (loop)/HBCD_PE.ini ]; then
-            set ventoy_compatible=YES
+        vt_check_pe (loop)        
+        if [ "$VT_PE_SUPPORT" != "YES" ]; then
+            if [ "$ventoy_fs_probe" = "iso9660" ]; then        
+                set ventoy_compatible=YES
+            fi
         fi
         
         legacy_windows_menu_func  $1 ${chosen_path}
@@ -435,7 +453,7 @@ function common_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.09"
+set VENTOY_VERSION="1.0.9Y"
 
 
 # Default menu display mode, you can change it as you want.

INSTALL/tool/ventoy_lib.sh

@@ -14,16 +14,6 @@ ventoy_true() {
 }
 
 ventoy_is_linux64() {
-    if [ -e /lib64 ]; then
-        ventoy_true
-        return
-    fi
-    
-    if [ -e /usr/lib64 ]; then
-        ventoy_true
-        return
-    fi
-    
     if uname -a | egrep -q 'x86_64|amd64'; then
         ventoy_true
         return
@@ -165,12 +155,12 @@ is_disk_contains_ventoy() {
         return
     fi
     
-    PART1_TYPE=$(dd if=$DISK bs=1 count=1 skip=450 status=none | ./tool/hexdump -n1 -e  '1/1 "%02X"')
-    if [ "$PART1_TYPE" != "07" ]; then
-        vtdebug "part1 type is $PART2_TYPE not 07"
-        ventoy_false
-        return
-    fi
+    # PART1_TYPE=$(dd if=$DISK bs=1 count=1 skip=450 status=none | ./tool/hexdump -n1 -e  '1/1 "%02X"')
+    # if [ "$PART1_TYPE" != "07" ]; then
+        # vtdebug "part1 type is $PART2_TYPE not 07"
+        # ventoy_false
+        # return
+    # fi
     
     if [ -e /sys/class/block/${PART1#/dev/}/start ]; then
         PART1_START=$(cat /sys/class/block/${PART1#/dev/}/start)