Apply Patch

This commit is contained in:
Ward Nakchbandi (CosmicFusion) 2024-12-17 19:28:58 +01:00
parent 994565c80d
commit e9121135c0
8 changed files with 36 additions and 16 deletions

View File

@ -61,11 +61,16 @@ mksquashfs \
# Copy kernel to refind # Copy kernel to refind
mkdir -p ./data/refind/EFI mkdir -p ./data/refind/EFI
cp -vf "$ROOTFS_PATH/boot"/vmlinuz-"$ISO_KERNEL" "./data/refind/EFI/vmlinuz" 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_SIZE=$(($(du -s -B1048576 ./data/refind | cut -f1) + 10))
EFI_BOOT_IMAGE="$LIVE_BOOT_PATH/efiboot.img" 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 # Create Refind Boot Image
dd if=/dev/zero of="$EFI_BOOT_IMAGE" bs=1M count=$EFI_BOOT_IMAGE_SIZE dd if=/dev/zero of="$EFI_BOOT_IMAGE" bs=1M count=$EFI_BOOT_IMAGE_SIZE
mkfs.vfat -F 32 "$EFI_BOOT_IMAGE" mkfs.vfat -F 32 "$EFI_BOOT_IMAGE"

View File

@ -25,7 +25,6 @@ apt-get full-upgrade --yes --option Dpkg::Options::="--force-confnew" --option D
# Install Absolute Live Boot Basics # Install Absolute Live Boot Basics
apt-get install --yes --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" --no-install-recommends \ apt-get install --yes --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" --no-install-recommends \
live-boot \
systemd-sysv \ systemd-sysv \
iwd \ iwd \
curl openssh-client \ curl openssh-client \

View File

@ -651,12 +651,12 @@ menuentry "PikaOS Live Image" {
icon EFI/BOOT/REFIND-DARK/ICONS/OS_PIKAOS.PNG icon EFI/BOOT/REFIND-DARK/ICONS/OS_PIKAOS.PNG
loader EFI/VMLINUZ loader EFI/VMLINUZ
initrd EFI/INITRD 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" { 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" { 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"
} }
} }

View File

@ -1,3 +1,3 @@
"Boot live image with standard options" "boot=live quiet splash ---" "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" "boot=live ---" "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" "boot=live nomodeset ---" "Boot live image with safe graphics" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot nomodeset ---"

View File

@ -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

View File

@ -22,5 +22,7 @@ f2fs-tools
xfsprogs xfsprogs
refind refind
mesa-hybrid mesa-hybrid
console-common console-data
console-data booster
plymouth
pika-live-booster-hooks

View File

@ -651,12 +651,12 @@ menuentry "PikaOS Live Image" {
icon EFI/BOOT/REFIND-DARK/ICONS/OS_PIKAOS.PNG icon EFI/BOOT/REFIND-DARK/ICONS/OS_PIKAOS.PNG
loader EFI/VMLINUZ loader EFI/VMLINUZ
initrd EFI/INITRD 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" { 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" { 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"
} }
} }

View File

@ -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 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" "boot=live modules_load=nvidia nvidia-drm.modeset=0 ---" "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" "boot=live nomodeset ---" "Boot live image with safe graphics" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY boot=live booster.loadcdrom booster.skiproot nomodeset ---"