From c60a9b885f0b67f02511821a21b85927ea52c1b9 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 19 Dec 2024 00:30:29 +0300 Subject: [PATCH] Latest Changes --- build.sh | 6 ++++-- data/refind/EFI/boot/refind.conf | 8 ++++---- data/refind/refind_linux.conf | 6 +++--- live-lists/0-basics.list | 2 ++ nvidia-enablement/data/refind/EFI/boot/refind.conf | 8 ++++---- nvidia-enablement/data/refind/refind_linux.conf | 6 +++--- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/build.sh b/build.sh index 3a9ee98..413fc95 100755 --- a/build.sh +++ b/build.sh @@ -67,9 +67,11 @@ cp -vf "$ROOTFS_PATH/boot"/booster.img-"$ISO_KERNEL" "./data/refind/EFI/initrd" EFI_BOOT_IMAGE_SIZE=$(($(du -s -B1048576 ./data/refind | cut -f1) + 10)) EFI_BOOT_IMAGE="$LIVE_BOOT_PATH/efiboot.img" -# Define VTOY_ISO_NAME in refind +# Create needed ISO Params in refind sed -i "s#THE_NAME_OF_CURRENT_ISO_FOR_VENTOY#$ISO_IMAGE".iso"#g" ./data/refind/refind_linux.conf sed -i "s#THE_NAME_OF_CURRENT_ISO_FOR_VENTOY#$ISO_IMAGE".iso"#g" ./data/refind/EFI/boot/refind.conf +sed -i "s#THE_LABEL_OF_CURRENT_ID#$ISO_IMAGE#g" ./data/refind/refind_linux.conf +sed -i "s#THE_LABEL_OF_CURRENT_ID#$ISO_IMAGE#g" ./data/refind/EFI/boot/refind.conf # Create Refind Boot Image dd if=/dev/zero of="$EFI_BOOT_IMAGE" bs=1M count=$EFI_BOOT_IMAGE_SIZE @@ -93,7 +95,7 @@ mkdir -p ./output xorriso \ -as mkisofs \ -iso-level 3 \ - -V "PikaOS 4" \ + -V "$ISO_IMAGE" \ -partition_offset 16 \ -appended_part_as_gpt \ -no-pad \ diff --git a/data/refind/EFI/boot/refind.conf b/data/refind/EFI/boot/refind.conf index 3c376b5..7dd109b 100644 --- a/data/refind/EFI/boot/refind.conf +++ b/data/refind/EFI/boot/refind.conf @@ -276,7 +276,7 @@ resolution max # with no options. # #showtools shell, bootorder, gdisk, memtest, mok_tool, apple_recovery, windows_recovery, about, hidden_tags, reboot, exit, firmware, fwupdate -showtools install,bootorder,shell,memtest,gdisk,apple_recovery,csr_rotate,windows_recovery,mok_tool,about,shutdown,reboot,firmware +#showtools install,bootorder,shell,memtest,gdisk,apple_recovery,csr_rotate,windows_recovery,mok_tool,about,shutdown,reboot,firmware # Additional directories to scan for tools. You may specify a directory # alone or a volume identifier plus pathname. The default is to scan no @@ -651,12 +651,12 @@ menuentry "PikaOS Live Image" { icon EFI/BOOT/REFIND-DARK/ICONS/OS_PIKAOS.PNG loader EFI/VMLINUZ initrd EFI/INITRD - options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot quiet splash" + options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot quiet splash" submenuentry "Boot live image with logging" { - options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot" + options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot" } submenuentry "Boot live image with safe graphics" { - options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot nomodeset" + options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot nomodeset" } } diff --git a/data/refind/refind_linux.conf b/data/refind/refind_linux.conf index 891a05c..2670f6c 100644 --- a/data/refind/refind_linux.conf +++ b/data/refind/refind_linux.conf @@ -1,3 +1,3 @@ -"Boot live image with standard options" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot quiet splash ---" -"Boot live image with logging" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot ---" -"Boot live image with safe graphics" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot nomodeset ---" +"Boot live image with standard options" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot quiet splash ---" +"Boot live image with logging" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot ---" +"Boot live image with safe graphics" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot nomodeset ---" diff --git a/live-lists/0-basics.list b/live-lists/0-basics.list index f0cc711..2af9abc 100755 --- a/live-lists/0-basics.list +++ b/live-lists/0-basics.list @@ -25,4 +25,6 @@ mesa-hybrid console-data booster plymouth +plymouth-themes +plymouth-theme-pika pika-live-booster-hooks \ No newline at end of file diff --git a/nvidia-enablement/data/refind/EFI/boot/refind.conf b/nvidia-enablement/data/refind/EFI/boot/refind.conf index e5595db..bf41177 100644 --- a/nvidia-enablement/data/refind/EFI/boot/refind.conf +++ b/nvidia-enablement/data/refind/EFI/boot/refind.conf @@ -276,7 +276,7 @@ resolution max # with no options. # #showtools shell, bootorder, gdisk, memtest, mok_tool, apple_recovery, windows_recovery, about, hidden_tags, reboot, exit, firmware, fwupdate -showtools install,bootorder,shell,memtest,gdisk,apple_recovery,csr_rotate,windows_recovery,mok_tool,about,shutdown,reboot,firmware +#showtools install,bootorder,shell,memtest,gdisk,apple_recovery,csr_rotate,windows_recovery,mok_tool,about,shutdown,reboot,firmware # Additional directories to scan for tools. You may specify a directory # alone or a volume identifier plus pathname. The default is to scan no @@ -651,12 +651,12 @@ menuentry "PikaOS Live Image" { icon EFI/BOOT/REFIND-DARK/ICONS/OS_PIKAOS.PNG loader EFI/VMLINUZ initrd EFI/INITRD - options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot modules_load=nvidia nvidia-drm.modeset=0 quiet splash" + options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot modules_load=nvidia nvidia-drm.modeset=0 quiet splash" submenuentry "Boot live image with logging" { - options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot modules_load=nvidia nvidia-drm.modeset=0" + options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot modules_load=nvidia nvidia-drm.modeset=0" } submenuentry "Boot live image with safe graphics" { - options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot nomodeset" + options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot nomodeset" } } diff --git a/nvidia-enablement/data/refind/refind_linux.conf b/nvidia-enablement/data/refind/refind_linux.conf index 984d210..e2b625d 100644 --- a/nvidia-enablement/data/refind/refind_linux.conf +++ b/nvidia-enablement/data/refind/refind_linux.conf @@ -1,3 +1,3 @@ -"Boot live image with standard options" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot modules_load=nvidia nvidia-drm.modeset=0 quiet splash ---" -"Boot live image with logging" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot modules_load=nvidia nvidia-drm.modeset=0 ---" -"Boot live image with safe graphics" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot nomodeset ---" +"Boot live image with standard options" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot modules_load=nvidia nvidia-drm.modeset=0 quiet splash ---" +"Boot live image with logging" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot modules_load=nvidia nvidia-drm.modeset=0 ---" +"Boot live image with safe graphics" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot nomodeset ---"