latest booster fixes

This commit is contained in:
Ward from fusion-voyager-3 2024-12-16 04:14:54 +03:00
parent c24661c44a
commit 4fd2ea72f8
5 changed files with 21 additions and 19 deletions

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 "boot=live booster.loadcdrom quiet splash"
submenuentry "Boot live image with logging" { submenuentry "Boot live image with logging" {
options "boot=live" options "boot=live booster.loadcdrom"
} }
submenuentry "Boot live image with safe graphics" { submenuentry "Boot live image with safe graphics" {
options "boot=live nomodeset" options "boot=live booster.loadcdrom nomodeset"
} }
} }

View File

@ -1,3 +1,3 @@
"Boot live image with standard options" "boot=live quiet splash ---" "Boot live image with standard options" "boot=live booster.loadcdrom quiet splash ---"
"Boot live image with logging" "boot=live ---" "Boot live image with logging" "boot=live booster.loadcdrom ---"
"Boot live image with safe graphics" "boot=live nomodeset ---" "Boot live image with safe graphics" "boot=live booster.loadcdrom nomodeset ---"

View File

@ -11,7 +11,9 @@ tee /usr/share/booster/hooks-early/pika_live.sh <<'EOF'
set -e 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 ### Config
MEDIUM_LABEL="PikaOS 4" 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 busybox mount -t tmpfs -o mode=1777 overlay_tmpfs /mnt/overlay
### Create overlay dirs ### Create overlay dirs
busyboxmkdir -p /mnt/overlay/upper /mnt/overlay/work busybox mkdir -p /mnt/overlay/upper /mnt/overlay/work
### Create merged overlay ### Create merged overlay
busybox mount -t overlay overlay -o lowerdir=/mnt/filesystem:/mnt/medium,upperdir=/mnt/overlay/upper,workdir=/mnt/overlay/work /booster.root 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 kernel filesystems
#mount -n -t devtmpfs devtmpfs /booster.root/dev #busybox mount -n -t devtmpfs devtmpfs /booster.root/dev
#mount -n -t proc proc /booster.root/proc #busybox mount -n -t proc proc /booster.root/proc
#mount -n -t sysfs sysfs /booster.root/sys #busybox mount -n -t sysfs sysfs /booster.root/sys
#mount -n -t tmpfs tmpfs /booster.root/run #busybox mount -n -t tmpfs tmpfs /booster.root/run
### Switch to new root ### Switch to new root
#switch_root "/booster.root/" "/booster.root/sbin/init" #busybox switch_root "/booster.root/" "/booster.root/sbin/init"
EOF EOF
chmod +x /usr/share/booster/hooks-early/pika_live.sh chmod +x /usr/share/booster/hooks-early/pika_live.sh

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