diff options
author | David P <megver83@parabola.nu> | 2020-08-31 00:17:00 -0400 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2020-08-31 13:43:05 -0400 |
commit | 97a607b2b24cb5d88f2d71ea1c2063aee955d77d (patch) | |
tree | 046ac996a16be1001adfc9b4e936057c41d4a67e | |
parent | 5c9ea0ce654f0b65e280cabc4c8dfb8efff51a3e (diff) |
sync refind entries with systemd-boot ones
Signed-off-by: David P <megver83@parabola.nu>
6 files changed, 10 insertions, 20 deletions
diff --git a/configs/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-cd.conf b/configs/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-cd.conf index 960458c..1bb9fe6 100644 --- a/configs/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-cd.conf +++ b/configs/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-cd.conf @@ -1,8 +1,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -menuentry "Parabola GNU/Linux-libre parabolaiso x86_64 UEFI CD" { - volume %PARABOLAISO_LABEL% +menuentry "Parabola GNU/Linux-libre install medium (x86_64, UEFI)" { loader /EFI/parabolaiso/vmlinuz-linux-libre initrd /EFI/parabolaiso/parabolaiso.img options "parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%" diff --git a/configs/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-usb.conf b/configs/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-usb.conf index 2173c03..4958c02 100644 --- a/configs/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-usb.conf +++ b/configs/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-usb.conf @@ -1,9 +1,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -menuentry "Parabola GNU/Linux-libre parabolaiso x86_64 UEFI USB" { - volume %PARABOLAISO_LABEL% - loader /%INSTALL_DIR%/parabolaiso/vmlinuz-linux-libre - initrd /%INSTALL_DIR%/parabolaiso/parabolaiso.img +menuentry "Parabola GNU/Linux-libre install medium (x86_64, UEFI)" { + loader /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre + initrd /%INSTALL_DIR%/boot/x86_64/parabolaiso.img options "parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%" } diff --git a/configs/lxde-openrc/efiboot/EFI/BOOT/refind.conf b/configs/lxde-openrc/efiboot/EFI/BOOT/refind.conf index c9e0c77..920709d 100644 --- a/configs/lxde-openrc/efiboot/EFI/BOOT/refind.conf +++ b/configs/lxde-openrc/efiboot/EFI/BOOT/refind.conf @@ -2,9 +2,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later timeout 3 -textonly scanfor manual - include entries/parabolaiso-x86_64.conf - -default_selection "Parabola GNU/Linux-libre" +default_selection entries/parabolaiso-x86_64.conf diff --git a/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-cd.conf b/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-cd.conf index 960458c..1bb9fe6 100644 --- a/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-cd.conf +++ b/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-cd.conf @@ -1,8 +1,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -menuentry "Parabola GNU/Linux-libre parabolaiso x86_64 UEFI CD" { - volume %PARABOLAISO_LABEL% +menuentry "Parabola GNU/Linux-libre install medium (x86_64, UEFI)" { loader /EFI/parabolaiso/vmlinuz-linux-libre initrd /EFI/parabolaiso/parabolaiso.img options "parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%" diff --git a/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-usb.conf b/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-usb.conf index 2173c03..4958c02 100644 --- a/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-usb.conf +++ b/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-usb.conf @@ -1,9 +1,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -menuentry "Parabola GNU/Linux-libre parabolaiso x86_64 UEFI USB" { - volume %PARABOLAISO_LABEL% - loader /%INSTALL_DIR%/parabolaiso/vmlinuz-linux-libre - initrd /%INSTALL_DIR%/parabolaiso/parabolaiso.img +menuentry "Parabola GNU/Linux-libre install medium (x86_64, UEFI)" { + loader /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre + initrd /%INSTALL_DIR%/boot/x86_64/parabolaiso.img options "parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%" } diff --git a/configs/releng-openrc/efiboot/EFI/BOOT/refind.conf b/configs/releng-openrc/efiboot/EFI/BOOT/refind.conf index c9e0c77..920709d 100644 --- a/configs/releng-openrc/efiboot/EFI/BOOT/refind.conf +++ b/configs/releng-openrc/efiboot/EFI/BOOT/refind.conf @@ -2,9 +2,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later timeout 3 -textonly scanfor manual - include entries/parabolaiso-x86_64.conf - -default_selection "Parabola GNU/Linux-libre" +default_selection entries/parabolaiso-x86_64.conf |