From 72b722c86c85d47de2ea0b6543d93c7aec82d854 Mon Sep 17 00:00:00 2001 From: longpanda Date: Fri, 21 Feb 2025 12:59:33 +0800 Subject: [PATCH] Fix the boot issue for latest TinyCore Linux. --- IMG/cpio/ventoy/hook/tinycore/ventoy-disk.sh | 16 ++++++++++++++-- INSTALL/grub/grub.cfg | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/IMG/cpio/ventoy/hook/tinycore/ventoy-disk.sh b/IMG/cpio/ventoy/hook/tinycore/ventoy-disk.sh index 90ebbafe..86dce825 100644 --- a/IMG/cpio/ventoy/hook/tinycore/ventoy-disk.sh +++ b/IMG/cpio/ventoy/hook/tinycore/ventoy-disk.sh @@ -45,8 +45,15 @@ fi # TinyCore linux distro doesn't contain dmsetup, we use aoe here sudo modprobe aoe aoe_iflist=lo if [ -e /sys/module/aoe ]; then - VBLADE_BIN=$(ventoy_get_vblade_bin) + if ! [ -d /lib64 ]; then + vtlog "link lib64" + NEED_UNLIB64=1 + ln -s /lib /lib64 + fi + + VBLADE_BIN=$(ventoy_get_vblade_bin) + sudo nohup $VBLADE_BIN -r -f $VTOY_PATH/ventoy_image_map 9 0 lo "$vtdiskname" > /dev/null & sleep 2 @@ -54,9 +61,14 @@ if [ -e /sys/module/aoe ]; then vtlog 'Wait for /dev/etherd/e9.0 ....' sleep 2 done - + sudo cp -a /dev/etherd/e9.0 "$vPart" + if [ -n "$NEED_UNLIB64" ]; then + vtlog "unlink lib64" + unlink /lib64 + fi + ventoy_find_bin_run rebuildfstab else vterr "aoe driver module load failed..." diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index 5bb87aa4..f722d9ce 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -671,7 +671,7 @@ function uefi_linux_menu_func { if [ -d (loop)/pmagic ]; then vt_linux_specify_initrd_file /pmagic/initrd.img else - for file in "boot/grub/grub.cfg" "EFI/BOOT/grub.cfg" "EFI/boot/grub.cfg" "efi/boot/grub.cfg" "EFI/BOOT/BOOTX64.conf" "/grub/grub.cfg"; do + for file in "boot/grub/grub.cfg" "EFI/BOOT/grub.cfg" "EFI/boot/grub.cfg" "efi/boot/grub.cfg" "EFI/BOOT/BOOTX64.conf" "/grub/grub.cfg" "EFI/BOOT/grub/grub.cfg"; do if [ -e (loop)/$file ]; then vt_linux_parse_initrd_grub file (loop)/$file fi