function get_os_type {
set vtoy_os=Linux
- for file in "efi/microsoft/boot/bcd" "sources/boot.wim" "boot/bcd" "bootmgr.efi" "boot/etfsboot.com" ; do
- if vt_file_exist_nocase (loop)/$file; then
+ if vt_str_begin "$vt_volume_id" "DLC Boot"; then
+ if [ -f (loop)/DLCBoot.exe ]; then
set vtoy_os=Windows
- break
fi
- done
+ else
+ for file in "efi/microsoft/boot/bcd" "sources/boot.wim" "boot/bcd" "bootmgr.efi" "boot/etfsboot.com" ; do
+ if vt_file_exist_nocase (loop)/$file; then
+ set vtoy_os=Windows
+ break
+ fi
+ done
+ fi
if [ "$vtoy_os" = "Linux" ]; then
if vt_strstr "$vt_system_id" "FreeBSD"; then
}
function locate_wim {
- vt_windows_locate_wim_patch (loop)
+ vt_windows_locate_wim_patch (loop) "$1"
if [ -n "${vtdebug_flag}" ]; then
echo '###############################################'
if [ -f (loop)/boot/boot.wim ]; then
vt_windows_collect_wim_patch wim /boot/boot.wim
fi
+
+ if vt_str_begin "$vt_volume_id" "DLC Boot"; then
+ for vwfile in "/DLC1/WinPE/W11x64.wim" "/DLC1/WinPE/W10x64.wim" "/DLC1/WinPE/W10x86.wim"; do
+ if [ -f (loop)/$vwfile ]; then
+ vt_windows_collect_wim_patch wim $vwfile
+ fi
+ done
+ fi
+
}
vt_linux_specify_initrd_file /initrd0.img
elif [ -f (loop)/sysresccd/boot/i686/sysresccd.img ]; then
vt_linux_specify_initrd_file /sysresccd/boot/i686/sysresccd.img
-
+ elif [ -f (loop)/boot/full.cz ]; then
+ vt_linux_specify_initrd_file /boot/full.cz
fi
}
fi
ventoy_debug_pause
- locate_wim
+ locate_wim "${chosen_path}"
fi
vt_windows_chain_data "${1}${chosen_path}"
ventoy_debug_pause
- if vt_check_mode 4; then
+ if vt_check_mode 4 "$vt_chosen_name"; then
vtoy_windows_wimboot_func
fi
vt_linux_initrd_count vtcount
if [ $vtcount -eq 0 ]; then
+ if [ -e (loop)/EFI/boot/livegrub.cfg ]; then
+ vt_linux_parse_initrd_grub file (loop)/EFI/boot/livegrub.cfg
+ fi
distro_specify_initrd_file_phase2
if [ "$vt_efi_dir" = "NO" ]; then
ventoy_cli_console
unset vtGrub2Mode
- if vt_check_mode 3; then
+ if vt_check_mode 3 "$vt_chosen_name"; then
set vtGrub2Mode=1
elif vt_str_begin "$vt_volume_id" "KRD"; then
if [ -f (loop)/boot/grub/grub.cfg.sig ]; then
if [ -n "$vtisouefi" ]; then
set LoadIsoEfiDriver=on
unset vtisouefi
- elif vt_check_mode 2; then
+ elif vt_check_mode 2 "$vt_chosen_name"; then
set LoadIsoEfiDriver=on
else
unset LoadIsoEfiDriver
if [ -n "$vtcompat" ]; then
set ventoy_compatible=YES
unset vtcompat
- elif vt_check_mode 1; then
+ elif vt_check_mode 1 "$vt_chosen_name"; then
set ventoy_compatible=YES
else
vt_check_compatible (loop)
fi
ventoy_debug_pause
- locate_wim
+ locate_wim "${chosen_path}"
fi
vt_windows_chain_data "${1}${chosen_path}"
ventoy_debug_pause
- if vt_check_mode 4; then
+ if vt_check_mode 4 "$vt_chosen_name"; then
vtoy_windows_wimboot_func
fi
if [ -n "$vtoy_chain_mem_addr" ]; then
ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
- linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+ if [ "$ventoy_compatible" = "NO" ]; then
+ linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+ else
+ linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+ fi
boot
else
echo "chain empty failed"
ventoy_debug_pause
if [ -n "$vtoy_chain_mem_addr" ]; then
- if vt_check_mode 3; then
+ if vt_check_mode 3 "$vt_chosen_name"; then
ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
ventoy_cli_console
if [ -n "$vtcompat" ]; then
set ventoy_compatible=YES
unset vtcompat
- elif vt_check_mode 1; then
+ elif vt_check_mode 1 "$vt_chosen_name"; then
set ventoy_compatible=YES
else
vt_check_compatible (loop)
unset vt_system_id
unset vt_volume_id
- vt_chosen_img_path vt_chosen_path vt_chosen_size
+ vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
vt_parse_iso_volume "${vtoy_iso_part}${vt_chosen_path}" vt_system_id vt_volume_id vt_volume_space
if [ $vt_volume_space -ne $vt_chosen_size ]; then
# auto memdisk mode for some special ISO files
vt_iso_vd_id_parse "${vtoy_iso_part}${vt_chosen_path}"
unset vtMemDiskBoot
- if vt_check_mode 0; then
+ if vt_check_mode 0 "$vt_chosen_name"; then
set vtMemDiskBoot=1
else
if [ "$grub_platform" = "pc" ]; then
elif vt_iso_vd_id_begin 0 1 "KolibriOS"; then
set vtMemDiskBoot=1
fi
- fi
+ fi
+
+ #For iKuai8 (<64MB)
+ if [ $vt_chosen_size -le 67108864 ]; then
+ if vt_str_begin "$vt_chosen_name" "iKuai"; then
+ set vtMemDiskBoot=1
+ fi
+ fi
fi
vt_iso_vd_id_clear
-
+
if [ "$grub_platform" = "pc" ]; then
if [ -n "$vtMemDiskBoot" ]; then
}
function miso_common_menuentry {
- vt_chosen_img_path vt_chosen_path vt_chosen_size
+ vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
if vt_check_password "${vt_chosen_path}"; then
return
}
function wim_common_menuentry {
- vt_chosen_img_path vt_chosen_path vt_chosen_size
+ vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
if vt_check_password "${vt_chosen_path}"; then
return
}
function efi_common_menuentry {
- vt_chosen_img_path vt_chosen_path vt_chosen_size
+ vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
if vt_check_password "${vt_chosen_path}"; then
return
vt_vlnk_dst="${vtoy_iso_part}${vt_chosen_path}"
fi
- vt_concat_efi_iso "${vt_vlnk_dst}" vtoy_iso_buf
-
ventoy_debug_pause
-
+
ventoy_cli_console
+
+ #first try with chainload
+ set vtOldRoot=$root
+ set root=$vtoy_iso_part
+ chainloader "${vt_vlnk_dst}"
+ boot
- unset vtoy_dotefi_retry
+ #retry with isoboot
+ set root=$vtOldRoot
+ vt_concat_efi_iso "${vt_vlnk_dst}" vtoy_iso_buf
chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi memdisk env_param=${env_param} dotefi isoefi=on ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size}
- boot
-
- if [ -n "$vtoy_dotefi_retry" ]; then
- unset vtoy_dotefi_retry
- chainloader "${vt_vlnk_dst}"
- boot
- fi
-
+ boot
+
ventoy_gui_console
}
}
function vhd_common_menuentry {
- vt_chosen_img_path vt_chosen_path vt_chosen_size
+ vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
if vt_check_password "${vt_chosen_path}"; then
return
}
function vtoy_common_menuentry {
- vt_chosen_img_path vt_chosen_path vt_chosen_size
+ vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
if vt_check_password "${vt_chosen_path}"; then
return
if [ -n "$vt_module_ver" ]; then
for mod in "kernel/drivers/md/dm-mod.ko" "kernel/drivers/dax/dax.ko"; do
- vt_img_extra_initrd_append (easysfs)/lib/modules/$vt_module_ver/$mod
+ if [ -e (easysfs)/lib/modules/$vt_module_ver/$mod ]; then
+ vt_img_extra_initrd_append (easysfs)/lib/modules/$vt_module_ver/$mod
+ fi
done
fi
set ventoy_busybox_ver=32
unset LoadIsoEfiDriver
- vt_chosen_img_path vt_chosen_path vt_chosen_size
+ vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
if vt_check_password "${vt_chosen_path}"; then
return
fi
if [ "$grub_platform" = "pc" ]; then
- if vt_check_mode 0; then
+ if vt_check_mode 0 "$vt_chosen_name"; then
legacy_img_memdisk $vtoy_iso_part "$vt_chosen_path"
return
fi
#############################################################
#############################################################
-set VENTOY_VERSION="1.0.70"
+set VENTOY_VERSION="1.0.78"
#ACPI not compatible with Window7/8, so disable by default
set VTOY_PARAM_NO_ACPI=1
terminal_output gfxterm
fi
+if [ "$grub_platform" = "efi" ]; then
+ set mouse_delta=4000
+ # terminal_input --append mouse
+fi
+
if [ -n "$VTOY_DEFAULT_KBD_LAYOUT" ]; then
set_keyboard_layout "$VTOY_DEFAULT_KBD_LAYOUT"
fi
fi
else
if [ -n "$VTOY_NO_ISO_TIP" ]; then
- NO_ISO_MENU="No ISO files found, $VTOY_NO_ISO_TIP"
+ NO_ISO_MENU="No ISO or supported IMG files found, $VTOY_NO_ISO_TIP"
elif [ -n "$VTOY_DEFAULT_SEARCH_ROOT" ]; then
- NO_ISO_MENU="No ISO files found, please check VTOY_DEFAULT_SEARCH_ROOT"
+ NO_ISO_MENU="No ISO or supported IMG files found, please check VTOY_DEFAULT_SEARCH_ROOT"
else
- NO_ISO_MENU="No ISO files found"
+ NO_ISO_MENU="No ISO or supported IMG files found"
fi
menuentry "$NO_ISO_MENU (Press enter to reboot ...)" {
echo -e "\n Rebooting ... "
export timeout
export default
+ vt_fn_mutex_lock 1
+
if [ "$vtHotkey" = "F2" ]; then
unset timeout
vt_browser_disk
ventoy_ext_menu
fi
+ vt_fn_mutex_lock 0
+
unset timeout
unset default
fi
projects / Ventoy.git / blobdiff