forked from images/live-iso-gnome
attempt 3 at fixing UEFI
This commit is contained in:
parent
0fa7733fdc
commit
52441333d6
2
.github/release-iso
vendored
2
.github/release-iso
vendored
@ -1 +1 @@
|
|||||||
5
|
6
|
||||||
|
22
build.sh
22
build.sh
@ -50,17 +50,23 @@ mksquashfs \
|
|||||||
-Xdict-size 1M \
|
-Xdict-size 1M \
|
||||||
-Xbcj x86
|
-Xbcj x86
|
||||||
|
|
||||||
# Copy Kernel to live
|
# Copy Kernel to live (Disabled, Copy Kernels to refind instead)
|
||||||
cp "$ROOTFS_PATH/boot"/vmlinuz-* \
|
#cp "$ROOTFS_PATH/boot"/vmlinuz-* \
|
||||||
"$LIVE_BOOT_LIVE_PATH/vmlinuz" && \
|
# "$LIVE_BOOT_LIVE_PATH/vmlinuz" && \
|
||||||
cp "$ROOTFS_PATH/boot"/initrd.img-* \
|
#cp "$ROOTFS_PATH/boot"/initrd.img-* \
|
||||||
"$LIVE_BOOT_LIVE_PATH/initrd" && \
|
# "$LIVE_BOOT_LIVE_PATH/initrd" && \
|
||||||
cp ./data/refind/refind_linux.conf \
|
#cp ./data/refind/refind_linux.conf \
|
||||||
"$LIVE_BOOT_LIVE_PATH/refind_linux.conf"
|
# "$LIVE_BOOT_LIVE_PATH/refind_linux.conf"
|
||||||
|
|
||||||
# Generate bootable EFI Image from refind
|
# 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"
|
mkfs.msdos -F 16 "$LIVE_BOOT_PATH/efiboot.img"
|
||||||
for directory in $(find ./data/refind/EFI/ -type d | cut -d'/' -f4-)
|
for directory in $(find ./data/refind/EFI/ -type d | cut -d'/' -f4-)
|
||||||
do
|
do
|
||||||
|
@ -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 UEFI PCs, default is internal,external,optical,manual
|
||||||
# On Macs, default is internal,hdbios,external,biosexternal,optical,cd,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
|
# By default, rEFInd relies on the UEFI firmware to detect BIOS-mode boot
|
||||||
# devices. This sometimes doesn't detect all the available devices, though.
|
# devices. This sometimes doesn't detect all the available devices, though.
|
||||||
@ -649,8 +649,8 @@ csr_values 10,77
|
|||||||
|
|
||||||
menuentry "PikaOS Live Image" {
|
menuentry "PikaOS Live Image" {
|
||||||
icon EFI/BOOT/REFIND-DARK/ICONS/OS_PIKAOS.PNG
|
icon EFI/BOOT/REFIND-DARK/ICONS/OS_PIKAOS.PNG
|
||||||
loader /live/vmlinuz
|
loader EFI/VMLINUZ
|
||||||
initrd /live/initrd
|
initrd EFI/INITRD
|
||||||
options "boot=live quiet splash"
|
options "boot=live quiet splash"
|
||||||
submenuentry "Boot live image with logging" {
|
submenuentry "Boot live image with logging" {
|
||||||
options "boot=live"
|
options "boot=live"
|
||||||
|
2
info.sh
2
info.sh
@ -9,6 +9,6 @@ export ISO_DISTNAME="PikaOS"
|
|||||||
export ISO_ARCH="amd64-v3"
|
export ISO_ARCH="amd64-v3"
|
||||||
export ISO_RELEASE="4.0"
|
export ISO_RELEASE="4.0"
|
||||||
export ISO_DESKTOP="GNOME"
|
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 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"
|
export LIVE_BOOT_VOLUME_NAME="$ISO_DISTNAME-$ISO_DESKTOP-$ISO_RELEASE-$ISO_ARCH-$ISO_PATCH"
|
||||||
|
Loading…
Reference in New Issue
Block a user