X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/99627752964e77e1e0365cc7395bf9803a7fb93f..1bf3e73373ccf4d515e4b554b5d8e233aaf1e6f3:/INSTALL/grub/grub.cfg diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index b85a31a..33789ac 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -157,6 +157,9 @@ function distro_specify_initrd_file { if [ -e (loop)/casper/initrd ]; then vt_linux_specify_initrd_file /casper/initrd fi + if [ -e (loop)/casper/initrd.gz ]; then + vt_linux_specify_initrd_file /casper/initrd.gz + fi if [ -e (loop)/casper/initrd-oem ]; then vt_linux_specify_initrd_file /casper/initrd-oem fi @@ -221,6 +224,8 @@ function distro_specify_initrd_file_phase2 { vt_linux_specify_initrd_file /initrd elif [ -f (loop)/live/initrd1 ]; then vt_linux_specify_initrd_file /live/initrd1 + elif vt_strstr $vt_volume_id "Daphile"; then + vt_linux_parse_initrd_isolinux (loop)/isolinux/ fi } @@ -899,36 +904,6 @@ function ventoy_img_volumio { vt_unset_boot_opt } -function ventoy_img_fydeos { - - set ventoy_busybox_ver=64 - - vt_load_cpio $vtoy_path/ventoy.cpio ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" - vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit - - # loopback easysfs (vtimghd,1)/easy.sfs - # vt_get_lib_module_ver (easysfs) /lib/modules/ vt_module_ver - - # 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 - # done - # fi - - ventoy_debug_pause - - #boot image file - vt_set_boot_opt rdinit=/vtoy/vtoy - vt_img_hook_root - - set root=(vtimghd,12) - configfile (vtimghd,12)/efi/boot/grub.cfg - #syslinux_configfile (vtimghd,12)/syslinux/syslinux.cfg - - vt_img_unhook_root - vt_unset_boot_opt -} - function img_common_menuentry { set ventoy_busybox_ver=32 @@ -950,15 +925,14 @@ function img_common_menuentry { vt_img_extra_initrd_reset + #vt_get_fs_label (vtimghd,1) vtImgHd1Label + if [ -e (vtimghd,1)/easy.sfs ]; then ventoy_img_easyos elif [ -e (vtimghd,1)/volumio.initrd ]; then ventoy_img_volumio - elif [ -e (vtimghd,3)/etc/os-release ]; then - if vt_file_strstr (vtimghd,3)/etc/os-release FydeOS; then - ventoy_img_fydeos - fi - + + else echo -e "\n This IMG file is NOT supported now. \n" echo -e " 当前不支持启动此 IMG 文件 \n" @@ -983,7 +957,7 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.18" +set VENTOY_VERSION="1.0.19" # Default menu display mode, you can change it as you want. # 0: List mode