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
+ set vtoy_os=Windows
break
fi
done
if [ "$vt_freebsd_ver" = "xx" ]; then
if [ -e (loop)/boot/kernel/kernel ]; then
vt_unix_parse_freebsd_ver_elf (loop)/boot/kernel/kernel $vt_freebsd_bit vt_freebsd_ver
+ elif [ -e (loop)/boot/kernel/kernel.gz ]; then
+ vt_unix_parse_freebsd_ver_elf (loop)/boot/kernel/kernel.gz $vt_freebsd_bit vt_freebsd_ver
fi
if [ "$vt_freebsd_ver" = "xx" ]; then
fi
done
- vt_unix_replace_ko $vt_unix_mod_path (vtunix)/ventoy_unix/$vtFreeBsdDistro/geom_ventoy_ko/$vt_freebsd_ver/$vt_freebsd_bit/geom_ventoy.ko.xz
- vt_unix_replace_conf FreeBSD "${1}${chosen_path}"
+ if [ -n "$vt_unix_mod_path" ]; then
+ vt_unix_replace_ko $vt_unix_mod_path (vtunix)/ventoy_unix/$vtFreeBsdDistro/geom_ventoy_ko/$vt_freebsd_ver/$vt_freebsd_bit/geom_ventoy.ko.xz
+ vt_unix_replace_conf FreeBSD "${1}${chosen_path}"
+ elif [ -e (loop)/easyre.ufs.uzip ]; then
+ vt_unix_replace_ko "/boot/grub/i386-pc/linux.mod" (vtunix)/ventoy_unix/$vtFreeBsdDistro/geom_ventoy_ko/$vt_freebsd_ver/$vt_freebsd_bit/geom_ventoy.ko.xz
+ if [ "$grub_platform" = "pc" ]; then
+ vt_unix_replace_grub_conf "/boot/grub/i386-pc/linux.mod" "cd9"
+ else
+ vt_unix_replace_conf FreeBSD "${1}${chosen_path}" "cd9"
+ fi
+ fi
}
function ventoy_dragonfly_proc {
function ventoy_unix_comm_proc {
vt_unix_reset
+ vt_unix_check_vlnk "${1}${chosen_path}"
+
if [ "$ventoy_compatible" = "NO" ]; then
loopback vtunix $vtoy_efi_part/ventoy/ventoy_unix.cpio
set vtcompat=1
fi
+
+ # 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
+ set vtMemDiskBoot=1
+ else
+ if [ "$grub_platform" = "pc" ]; then
+ if vt_iso_vd_id_begin 1 0 "Memtest86+"; then
+ set vtMemDiskBoot=1
+ elif vt_iso_vd_id_begin 0 1 "KolibriOS"; then
+ set vtMemDiskBoot=1
+ fi
+ fi
+ fi
+ vt_iso_vd_id_clear
+
+
if [ "$grub_platform" = "pc" ]; then
- if vt_check_mode 0; then
+ if [ -n "$vtMemDiskBoot" ]; then
legacy_iso_memdisk $vtoy_iso_part "$vt_chosen_path"
else
legacy_iso_menu_func $vtoy_iso_part "$vt_chosen_path"
fi
else
- if vt_check_mode 0; then
+ if [ -n "$vtMemDiskBoot" ]; then
uefi_iso_memdisk $vtoy_iso_part "$vt_chosen_path"
else
uefi_iso_menu_func $vtoy_iso_part "$vt_chosen_path"
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
}
#############################################################
#############################################################
-set VENTOY_VERSION="1.0.70"
+set VENTOY_VERSION="1.0.74"
#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
export VTOY_CHKSUM_FILE_PATH
+#colect all image files (iso files)
+set ventoy_img_count=0
+vt_list_img $vtoy_iso_part ventoy_img_count
+
+#Main menu
+if [ $ventoy_img_count -gt 0 ]; then
+ if [ $VTOY_DEFAULT_MENU_MODE -eq 0 ]; then
+ vt_dynamic_menu 0 0
+ else
+ vt_dynamic_menu 0 1
+ fi
+else
+ if [ -n "$VTOY_NO_ISO_TIP" ]; then
+ 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 or supported IMG files found, please check VTOY_DEFAULT_SEARCH_ROOT"
+ else
+ NO_ISO_MENU="No ISO or supported IMG files found"
+ fi
+ menuentry "$NO_ISO_MENU (Press enter to reboot ...)" {
+ echo -e "\n Rebooting ... "
+ reboot
+ }
+fi
+
+
#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
export timeout
export default
-
- if [ "$vtHotkey" = "F4" ]; then
+
+ vt_fn_mutex_lock 1
+
+ if [ "$vtHotkey" = "F2" ]; then
+ unset timeout
+ vt_browser_disk
+ elif [ "$vtHotkey" = "F4" ]; then
ventoy_localboot
elif [ "$vtHotkey" = "F5" ]; then
ventoy_diagnosis
ventoy_ext_menu
fi
+ vt_fn_mutex_lock 0
+
unset timeout
unset default
fi
fi
-#colect all image files (iso files)
-set ventoy_img_count=0
-vt_list_img $vtoy_iso_part ventoy_img_count
-
-#Main menu
-if [ $ventoy_img_count -gt 0 ]; then
- if [ $VTOY_DEFAULT_MENU_MODE -eq 0 ]; then
- vt_dynamic_menu 0 0
- else
- vt_dynamic_menu 0 1
- fi
-else
- if [ -n "$VTOY_NO_ISO_TIP" ]; then
- NO_ISO_MENU="No ISO 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"
- else
- NO_ISO_MENU="No ISO files found"
- fi
- menuentry "$NO_ISO_MENU (Press enter to reboot ...)" {
- echo -e "\n Rebooting ... "
- reboot
- }
-fi
projects / Ventoy.git / blobdiff