function vt_check_compatible_pe {
#Check for PE without external tools
+ #set compatible if ISO file is less than 80MB
+ if [ $vt_chosen_size -gt 33554432 -a $vt_chosen_size -le 83886080 ]; then
+ set ventoy_compatible=YES
+ fi
+
return
}
vt_windows_collect_wim_patch wim /BOOT/H3_7PE.WIM
vt_windows_collect_wim_patch wim /BOOT/H3_8PE.WIM
vt_windows_collect_wim_patch wim /BOOT/H3_81PE.WIM
- fi
+ elif [ -d (loop)/2k10/winpe ]; then
+ vt_windows_collect_wim_patch wim /2k10/winpe/w1086pe.wim
+ vt_windows_collect_wim_patch wim /2k10/winpe/w8x86pe.wim
+ vt_windows_collect_wim_patch wim /2k10/winpe/w7x86pe.wim
+ fi
}
function distro_specify_wim_patch_phase2 {
else
vt_iso9660_nojoliet 0
fi
+
+ vt_append_extra_sector 0
}
function uefi_iso_menu_func {
else
set ventoy_fs_probe=iso9660
ventoy_reset_nojoliet
+
+ # Lenovo EasyStartup need an addional sector for boundary check
+ if vt_str_begin "$vt_volume_id" "EasyStartup"; then
+ vt_skip_svd "${vtoy_iso_part}${vt_chosen_path}"
+ vt_append_extra_sector 1
+ fi
fi
loopback loop "${1}${chosen_path}"
loopback loop "$1$2"
fi
- for file in "boot/bcd" "/efi/microsoft/boot/bcd" "SSTR/BCD"; do
+ for file in "boot/bcd" "/efi/microsoft/boot/bcd" "SSTR/BCD" "boot/bce"; do
vt_windows_collect_wim_patch bcd (loop)/$file
done
set ventoy_fs_probe=iso9660
loopback loop "$1$2"
fi
+
+ if [ -f (loop)/isolinux/isolinux.cfg ]; then
+ if vt_iso9660_isjoliet; then
+ vt_iso9660_nojoliet 1
+ loopback -d loop
+ loopback loop "$1$2"
+ fi
+ fi
vt_load_cpio $vtoy_path "$2" "$1" "busybox=$ventoy_busybox_ver"
#============================================================#
#
+function only_uefi_tip {
+ echo -e "\n This IMG file is only supported in UEFI mode. \n"
+ echo -e "\n press ENTER to exit ..."
+ read vtInputKey
+}
function ventoy_img_easyos {
vt_load_cpio $vtoy_path "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
vt_unset_boot_opt
}
+function ventoy_img_fydeos {
+ if [ "$grub_platform" = "pc" ]; then
+ only_uefi_tip
+ return
+ fi
+
+ vt_load_cpio $vtoy_path "${vt_chosen_path}" ${vtoy_iso_part} "busybox=64"
+ vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit
+
+ ventoy_debug_pause
+
+ #boot image file
+ vt_set_boot_opt rdinit=/vtoy/vtoy ventoyos=fydeos
+ vt_img_hook_root
+
+ set grubdisk=vtimghd
+ set grubpartA=(vtimghd,3)
+ set grubpartB=(vtimghd,5)
+ set linuxpartA=(sda,3)
+ set linuxpartB=(sda,5)
+
+ set root=(vtimghd,12)
+ configfile (vtimghd,12)/efi/boot/grub.cfg
+
+ vt_img_unhook_root
+ vt_unset_boot_opt
+
+ unset grubdisk
+ unset grubpartA
+ unset grubpartB
+ unset linuxpartA
+ unset linuxpartB
+}
+
+function ventoy_img_cloudready {
+ if [ "$grub_platform" = "pc" ]; then
+ only_uefi_tip
+ return
+ fi
+
+ vt_load_cpio $vtoy_path "${vt_chosen_path}" ${vtoy_iso_part} "busybox=64"
+ vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit
+
+ ventoy_debug_pause
+
+ #boot image file
+ vt_set_boot_opt rdinit=/vtoy/vtoy ventoyos=cloudready
+ vt_img_hook_root
+
+ set grubdisk=vtimghd
+ set grubpartA=(vtimghd,3)
+ set grubpartB=(vtimghd,5)
+ set linuxpartA=(sda,3)
+ set linuxpartB=(sda,5)
+
+ set root=(vtimghd,12)
+ configfile (vtimghd,12)/efi/boot/grub.cfg
+
+ vt_img_unhook_root
+ vt_unset_boot_opt
+
+ unset grubdisk
+ unset grubpartA
+ unset grubpartB
+ unset linuxpartA
+ unset linuxpartB
+}
+
function ventoy_img_memtest86 {
chainloader (vtimghd,1)/efi/boot/BOOTX64.efi
boot
function img_common_menuentry {
set ventoy_compatible=YES
set ventoy_busybox_ver=32
+ unset LoadIsoEfiDriver
vt_chosen_img_path vt_chosen_path vt_chosen_size
vt_get_fs_label (vtimghd,1) vtImgHd1Label
- if [ -d (vtimghd,2)/lib ]; then
+
+ if [ "$vtImgHd1Label" = "STATE" ]; then
+ vt_get_fs_label (vtimghd,3) vtImgHd3Label
+ elif [ -d (vtimghd,2)/lib ]; then
vt_get_fs_label (vtimghd,2) vtImgHd2Label
fi
-
+
if [ -e (vtimghd,1)/etc/hostname ]; then
vt_1st_line (vtimghd,1)/etc/hostname vtImgHostname
fi
-
-
- if [ -e (vtimghd,1)/easy.sfs ]; then
- ventoy_img_easyos
- elif [ -e (vtimghd,1)/volumio.initrd ]; then
- ventoy_img_volumio
+
+ if vt_str_begin "$vtImgHd3Label" "ROOT-"; then
+ if [ -f (vtimghd,3)/etc/os-release.d/ID ]; then
+ vt_1st_line (vtimghd,3)/etc/os-release.d/ID vt_release_line1
+ if [ vt_str_begin "$vt_release_line1" "FydeOS" ]; then
+ ventoy_img_fydeos
+ fi
+ elif [ -f (vtimghd,3)/etc/cloudready-release ]; then
+ ventoy_img_cloudready
+ fi
elif vt_str_begin "$vtImgHd1Label" "LAKKA"; then
ventoy_img_openelec lakka
elif vt_str_begin "$vtImgHd1Label" "LIBREELEC"; then
ventoy_img_tails
elif [ "$vtImgHd2Label" = "RECALBOX" ]; then
ventoy_img_recalbox
+ elif [ -e (vtimghd,1)/easy.sfs ]; then
+ ventoy_img_easyos
+ elif [ -e (vtimghd,1)/volumio.initrd ]; then
+ ventoy_img_volumio
elif [ -f (vtimghd,2)/loader/entries/ubos.conf ]; then
ventoy_img_ubos
elif [ -f (vtimghd,2)/etc/openwrt_version ]; then
img_unsupport_tip
else
ventoy_img_memtest86
- fi
+ fi
else
vt_linux_chain_data "${vtoy_iso_part}${vt_chosen_path}"
ventoy_acpi_param ${vtoy_chain_mem_addr} 512
#############################################################
#############################################################
-set VENTOY_VERSION="1.0.47"
+set VENTOY_VERSION="1.0.51"
#ACPI not compatible with Window7/8, so disable by default
set VTOY_PARAM_NO_ACPI=1
#Load Plugin
if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then
- clear
- vt_load_plugin $vtoy_iso_part
- clear
+ clear
+ vt_load_plugin $vtoy_iso_part
+ clear
+else
+ vt_check_json_path_case $vtoy_iso_part
fi
if [ -n "$VTOY_MENU_TIMEOUT" ]; then
set_keyboard_layout "$VTOY_DEFAULT_KBD_LAYOUT"
fi
+if [ -n "$VTOY_PLUGIN_PATH_CASE_MISMATCH" ]; then
+ clear
+ echo "$VTOY_PLUGIN_PATH_CASE_MISMATCH"
+ echo -e "\n\nPath case does not match! ventoy directory and ventoy.json MUST be all lowercase!"
+ echo -e "\n路径大小写不匹配！ventoy 目录和 ventoy.json 文件的名字必须是全部小写，请修正！"
+ echo -e "\n\npress ENTER to continue (请按回车键继续) ..."
+ read vtInputKey
+fi
+
if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then
clear
echo -e "\n Syntax error detected in ventoy.json, please check! \n"
projects / Ventoy.git / blobdiff