From 4fd2ea72f8ae7706253884ba6c1ee3390177a5bd Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Mon, 16 Dec 2024 04:14:54 +0300 Subject: [PATCH] latest booster fixes --- data/refind/EFI/boot/refind.conf | 6 +++--- data/refind/refind_linux.conf | 6 +++--- hooks/4-booster-setup.chroot | 16 +++++++++------- .../data/refind/EFI/boot/refind.conf | 6 +++--- nvidia-enablement/data/refind/refind_linux.conf | 6 +++--- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/data/refind/EFI/boot/refind.conf b/data/refind/EFI/boot/refind.conf index afb7c85..b4f076f 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 "boot=live booster.loadcdrom quiet splash" submenuentry "Boot live image with logging" { - options "boot=live" + options "boot=live booster.loadcdrom" } submenuentry "Boot live image with safe graphics" { - options "boot=live nomodeset" + options "boot=live booster.loadcdrom nomodeset" } } diff --git a/data/refind/refind_linux.conf b/data/refind/refind_linux.conf index 2013653..328ae31 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" "boot=live booster.loadcdrom quiet splash ---" +"Boot live image with logging" "boot=live booster.loadcdrom ---" +"Boot live image with safe graphics" "boot=live booster.loadcdrom nomodeset ---" diff --git a/hooks/4-booster-setup.chroot b/hooks/4-booster-setup.chroot index 6ea33ec..4220abf 100755 --- a/hooks/4-booster-setup.chroot +++ b/hooks/4-booster-setup.chroot @@ -11,7 +11,9 @@ tee /usr/share/booster/hooks-early/pika_live.sh <<'EOF' set -e -cat /proc/cmdline | grep 'boot=live' || exit 0 +busybox mount -n -t proc proc /proc + +busybox cat /proc/cmdline | busybox grep 'boot=live booster.loadcdrom' || exit 0 ### Config MEDIUM_LABEL="PikaOS 4" @@ -36,20 +38,20 @@ busybox mount -o loop,ro /mnt/medium/live/filesystem.squashfs /mnt/filesystem busybox mount -t tmpfs -o mode=1777 overlay_tmpfs /mnt/overlay ### Create overlay dirs - busyboxmkdir -p /mnt/overlay/upper /mnt/overlay/work +busybox mkdir -p /mnt/overlay/upper /mnt/overlay/work ### Create merged overlay busybox mount -t overlay overlay -o lowerdir=/mnt/filesystem:/mnt/medium,upperdir=/mnt/overlay/upper,workdir=/mnt/overlay/work /booster.root ### mount kernel filesystems -#mount -n -t devtmpfs devtmpfs /booster.root/dev -#mount -n -t proc proc /booster.root/proc -#mount -n -t sysfs sysfs /booster.root/sys -#mount -n -t tmpfs tmpfs /booster.root/run +#busybox mount -n -t devtmpfs devtmpfs /booster.root/dev +#busybox mount -n -t proc proc /booster.root/proc +#busybox mount -n -t sysfs sysfs /booster.root/sys +#busybox mount -n -t tmpfs tmpfs /booster.root/run ### Switch to new root -#switch_root "/booster.root/" "/booster.root/sbin/init" +#busybox switch_root "/booster.root/" "/booster.root/sbin/init" EOF chmod +x /usr/share/booster/hooks-early/pika_live.sh diff --git a/nvidia-enablement/data/refind/EFI/boot/refind.conf b/nvidia-enablement/data/refind/EFI/boot/refind.conf index a9d00c9..ab3d8fa 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 "boot=live booster.loadcdrom 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 "boot=live booster.loadcdrom modules_load=nvidia nvidia-drm.modeset=0" } submenuentry "Boot live image with safe graphics" { - options "boot=live nomodeset" + options "boot=live booster.loadcdrom nomodeset" } } diff --git a/nvidia-enablement/data/refind/refind_linux.conf b/nvidia-enablement/data/refind/refind_linux.conf index f5d88c5..4a8d81b 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" "boot=live booster.loadcdrom modules_load=nvidia nvidia-drm.modeset=0 quiet splash ---" +"Boot live image with logging" "boot=live booster.loadcdrom modules_load=nvidia nvidia-drm.modeset=0 ---" +"Boot live image with safe graphics" "boot=live booster.loadcdrom nomodeset ---"