attempt 3 at fixing UEFI
All checks were successful
Release ISO / build (push) Successful in 5m26s

This commit is contained in:
Ward from fusion-voyager-3 2024-08-02 01:24:07 +03:00
parent 0fa7733fdc
commit 52441333d6
4 changed files with 19 additions and 13 deletions

2
.github/release-iso vendored
View File

@ -1 +1 @@
5
6

View File

@ -50,17 +50,23 @@ mksquashfs \
-Xdict-size 1M \
-Xbcj x86
# Copy Kernel to live
cp "$ROOTFS_PATH/boot"/vmlinuz-* \
"$LIVE_BOOT_LIVE_PATH/vmlinuz" && \
cp "$ROOTFS_PATH/boot"/initrd.img-* \
"$LIVE_BOOT_LIVE_PATH/initrd" && \
cp ./data/refind/refind_linux.conf \
"$LIVE_BOOT_LIVE_PATH/refind_linux.conf"
# Copy Kernel to live (Disabled, Copy Kernels to refind instead)
#cp "$ROOTFS_PATH/boot"/vmlinuz-* \
# "$LIVE_BOOT_LIVE_PATH/vmlinuz" && \
#cp "$ROOTFS_PATH/boot"/initrd.img-* \
# "$LIVE_BOOT_LIVE_PATH/initrd" && \
#cp ./data/refind/refind_linux.conf \
# "$LIVE_BOOT_LIVE_PATH/refind_linux.conf"
# Generate bootable EFI Image from refind
dd if=/dev/zero of="$LIVE_BOOT_PATH/efiboot.img" bs=1M count=20
# Copy kernel to refind
cp "$ROOTFS_PATH/boot"/vmlinuz-* \
"./data/refind/EFI/vmlinuz" && \
cp "$ROOTFS_PATH/boot"/initrd.img-* \
"./data/refind/EFI/initrd"
dd if=/dev/zero of="$LIVE_BOOT_PATH/efiboot.img" bs=1M count=512
mkfs.msdos -F 16 "$LIVE_BOOT_PATH/efiboot.img"
for directory in $(find ./data/refind/EFI/ -type d | cut -d'/' -f4-)
do

View File

@ -331,7 +331,7 @@ showtools install,bootorder,shell,memtest,gdisk,apple_recovery,csr_rotate,window
# On UEFI PCs, default is internal,external,optical,manual
# On Macs, default is internal,hdbios,external,biosexternal,optical,cd,manual
#
scanfor manual,firmware
scanfor manual
# By default, rEFInd relies on the UEFI firmware to detect BIOS-mode boot
# devices. This sometimes doesn't detect all the available devices, though.
@ -649,8 +649,8 @@ csr_values 10,77
menuentry "PikaOS Live Image" {
icon EFI/BOOT/REFIND-DARK/ICONS/OS_PIKAOS.PNG
loader /live/vmlinuz
initrd /live/initrd
loader EFI/VMLINUZ
initrd EFI/INITRD
options "boot=live quiet splash"
submenuentry "Boot live image with logging" {
options "boot=live"

View File

@ -9,6 +9,6 @@ export ISO_DISTNAME="PikaOS"
export ISO_ARCH="amd64-v3"
export ISO_RELEASE="4.0"
export ISO_DESKTOP="GNOME"
export ISO_PATCH="3"
export ISO_PATCH="4"
export ISO_IMAGE="$ISO_DISTNAME-$ISO_DESKTOP-$ISO_RELEASE-$ISO_ARCH-$(date '+%y.%m.%d')-$ISO_PATCH"
export LIVE_BOOT_VOLUME_NAME="$ISO_DISTNAME-$ISO_DESKTOP-$ISO_RELEASE-$ISO_ARCH-$ISO_PATCH"