From e9121135c06bd41cc3ed837a2c3b83d11227c4a2 Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (CosmicFusion)" Date: Tue, 17 Dec 2024 19:28:58 +0100 Subject: [PATCH] Apply Patch --- build.sh | 7 ++++++- chroot_scripts/0-chroot.sh | 1 - data/refind/EFI/boot/refind.conf | 6 +++--- data/refind/refind_linux.conf | 6 +++--- hooks/4-booster-setup.chroot | 14 ++++++++++++++ live-lists/0-basics.list | 6 ++++-- nvidia-enablement/data/refind/EFI/boot/refind.conf | 6 +++--- nvidia-enablement/data/refind/refind_linux.conf | 6 +++--- 8 files changed, 36 insertions(+), 16 deletions(-) create mode 100644 hooks/4-booster-setup.chroot diff --git a/build.sh b/build.sh index fbdc649..3a9ee98 100755 --- a/build.sh +++ b/build.sh @@ -61,11 +61,16 @@ mksquashfs \ # Copy kernel to refind mkdir -p ./data/refind/EFI cp -vf "$ROOTFS_PATH/boot"/vmlinuz-"$ISO_KERNEL" "./data/refind/EFI/vmlinuz" -cp -vf "$ROOTFS_PATH/boot"/initrd.img-"$ISO_KERNEL" "./data/refind/EFI/initrd" +#cp -vf "$ROOTFS_PATH/boot"/initrd.img-"$ISO_KERNEL" "./data/refind/EFI/initrd" +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 +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 + # Create Refind Boot Image dd if=/dev/zero of="$EFI_BOOT_IMAGE" bs=1M count=$EFI_BOOT_IMAGE_SIZE mkfs.vfat -F 32 "$EFI_BOOT_IMAGE" diff --git a/chroot_scripts/0-chroot.sh b/chroot_scripts/0-chroot.sh index 971d13c..47672a8 100755 --- a/chroot_scripts/0-chroot.sh +++ b/chroot_scripts/0-chroot.sh @@ -25,7 +25,6 @@ apt-get full-upgrade --yes --option Dpkg::Options::="--force-confnew" --option D # Install Absolute Live Boot Basics apt-get install --yes --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" --no-install-recommends \ - live-boot \ systemd-sysv \ iwd \ curl openssh-client \ diff --git a/data/refind/EFI/boot/refind.conf b/data/refind/EFI/boot/refind.conf index afb7c85..3c376b5 100644 --- a/data/refind/EFI/boot/refind.conf +++ b/data/refind/EFI/boot/refind.conf @@ -651,12 +651,12 @@ menuentry "PikaOS Live Image" { icon EFI/BOOT/REFIND-DARK/ICONS/OS_PIKAOS.PNG loader EFI/VMLINUZ initrd EFI/INITRD - options "boot=live quiet splash" + options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot quiet splash" submenuentry "Boot live image with logging" { - options "boot=live" + options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot" } submenuentry "Boot live image with safe graphics" { - options "boot=live nomodeset" + options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot nomodeset" } } diff --git a/data/refind/refind_linux.conf b/data/refind/refind_linux.conf index 2013653..891a05c 100644 --- a/data/refind/refind_linux.conf +++ b/data/refind/refind_linux.conf @@ -1,3 +1,3 @@ -"Boot live image with standard options" "boot=live quiet splash ---" -"Boot live image with logging" "boot=live ---" -"Boot live image with safe graphics" "boot=live nomodeset ---" +"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 ---" diff --git a/hooks/4-booster-setup.chroot b/hooks/4-booster-setup.chroot new file mode 100644 index 0000000..99d5876 --- /dev/null +++ b/hooks/4-booster-setup.chroot @@ -0,0 +1,14 @@ +#!/bin/sh +touch /etc/booster.yaml +tee /etc/booster.yaml <<'EOF' +vconsole: true +extra_files: busybox +enable_lvm: true +modules_force_load: usbhid,hid_generic,loop,usb_storage +universal: true +modules: usbhid,hid_generic,loop,usb_storage +enable_hooks: true +enable_plymouth: true +EOF + +update-initramfs -c -k all diff --git a/live-lists/0-basics.list b/live-lists/0-basics.list index 552db4c..f0cc711 100755 --- a/live-lists/0-basics.list +++ b/live-lists/0-basics.list @@ -22,5 +22,7 @@ f2fs-tools xfsprogs refind mesa-hybrid -console-common -console-data \ No newline at end of file +console-data +booster +plymouth +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 a9d00c9..e5595db 100644 --- a/nvidia-enablement/data/refind/EFI/boot/refind.conf +++ b/nvidia-enablement/data/refind/EFI/boot/refind.conf @@ -651,12 +651,12 @@ menuentry "PikaOS Live Image" { icon EFI/BOOT/REFIND-DARK/ICONS/OS_PIKAOS.PNG loader EFI/VMLINUZ initrd EFI/INITRD - options "boot=live modules_load=nvidia nvidia-drm.modeset=0 quiet splash" + 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" submenuentry "Boot live image with logging" { - options "boot=live modules_load=nvidia nvidia-drm.modeset=0" + options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot modules_load=nvidia nvidia-drm.modeset=0" } submenuentry "Boot live image with safe graphics" { - options "boot=live nomodeset" + options "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY 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 f5d88c5..984d210 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" "boot=live modules_load=nvidia nvidia-drm.modeset=0 quiet splash ---" -"Boot live image with logging" "boot=live modules_load=nvidia nvidia-drm.modeset=0 ---" -"Boot live image with safe graphics" "boot=live nomodeset ---" +"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 ---"