1. Fix a bug about source media missing when boot CentOS8

[Ventoy.git] / INSTALL / grub / grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 85a630a18b0b59b9a5965f6f880853838840430d..386997d659c893af1b9992d244202d00fbc4f048 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -311,6 +311,8 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /antiX/initrd.gz
     elif [ -f (loop)/360Disk/initrd.gz ]; then
         vt_linux_specify_initrd_file /360Disk/initrd.gz
+    elif [ -f (loop)/porteus/initrd.xz ]; then
+        vt_linux_specify_initrd_file /porteus/initrd.xz
     
     fi
 }
@@ -646,10 +648,14 @@ function uefi_linux_menu_func {
     if [ -n "$vtoy_chain_mem_addr" ]; then
         ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         ventoy_cli_console     
-        
-        if [ "$VTOY_EFI_ARCH" != "mips" ]; then
-            chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi fallback env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
-            boot
+
+        if vt_check_mode 3; then
+            ventoy_debug_pause
+        else
+            if [ "$VTOY_EFI_ARCH" != "mips" ]; then
+                chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi fallback env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+                boot
+            fi
         fi
 
         # fallback
@@ -1030,7 +1036,7 @@ function iso_common_menuentry {
     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        
         vt_mod $vt_chosen_size 2048 vt_chosen_size_mod
-        if [ $vt_volume_space -gt $vt_chosen_size -o $vt_chosen_size_mod -ne 0 ]; then
+        if [ $vt_chosen_size_mod -ne 0 ]; then
             echo -e "\n $vt_volume_space $vt_chosen_size $vt_chosen_size_mod\n"
             echo -e "\n The size of the iso file \"$vt_chosen_size\" is invalid. File corrupted ?\n"
             echo -e " 此ISO文件的大小 \"$vt_chosen_size\" 有问题，请确认文件是否损坏。\n"
@@ -1480,6 +1486,23 @@ function ventoy_img_batocera {
     vt_unset_boot_opt
 }
 
+function ventoy_img_tails {
+    vt_load_cpio  $vtoy_path  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit
+
+    ventoy_debug_pause
+
+    #boot image file
+    vt_set_boot_opt rdinit=/vtoy/vtoy live-media=/dev/dm-1 ventoyos=tails
+    vt_img_hook_root
+    
+    set root=(vtimghd,1)
+    configfile (vtimghd,1)/efi/debian/grub.cfg
+
+    vt_img_unhook_root
+    vt_unset_boot_opt
+}
+
 function ventoy_img_memtest86 {      
     chainloader (vtimghd,1)/efi/boot/BOOTX64.efi
     boot
@@ -1518,6 +1541,8 @@ function img_common_menuentry {
     set vtback_root=$root
     ventoy_cli_console
     vt_push_last_entry
+    set vtback_theme=$theme
+    unset theme
 
     vt_img_extra_initrd_reset
 
@@ -1544,6 +1569,8 @@ function img_common_menuentry {
         ventoy_img_freedombox
     elif vt_str_begin "$vtImgHd1Label" "BATOCERA"; then
         ventoy_img_batocera
+    elif vt_str_begin "$vtImgHd1Label" "Tails"; then
+        ventoy_img_tails
     elif [ "$vtImgHd2Label" = "RECALBOX" ]; then
         ventoy_img_recalbox
     elif [ -f (vtimghd,2)/loader/entries/ubos.conf ]; then
@@ -1568,6 +1595,7 @@ function img_common_menuentry {
 
     set root=$vtback_root
     vt_pop_last_entry
+    set theme=$vtback_theme
     ventoy_gui_console
     set ventoy_compatible=NO
 }
@@ -1584,7 +1612,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.37"
+set VENTOY_VERSION="1.0.40"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -1596,6 +1624,7 @@ set VTOY_DEFAULT_MENU_MODE=0
 
 set VTOY_MEM_DISK_STR="[Memdisk]"
 set VTOY_ISO_RAW_STR="Compatible Mode"
+set VTOY_GRUB2_MODE_STR="GRUB2 Mode"
 set VTOY_ISO_UEFI_DRV_STR="UEFI FS"
 
 set VTOY_F2_CMD="ventoy_power"
@@ -1725,6 +1754,9 @@ else
     terminal_output  gfxterm
 fi
 
+if [ -n "$VTOY_DEFAULT_KBD_LAYOUT" ]; then
+    set_keyboard_layout "$VTOY_DEFAULT_KBD_LAYOUT"
+fi
 
 if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then
     clear
@@ -1744,6 +1776,8 @@ for vtTFile in ventoy.json ventoy_grub.cfg; do
     fi
 done
 
+#clear all input key before show main menu
+vt_clear_key
 
 #export necessary variable
 export theme