diff options
| author | David P <megver83@parabola.nu> | 2020-09-28 14:39:20 -0300 |
|---|---|---|
| committer | David P <megver83@parabola.nu> | 2020-09-28 14:49:39 -0300 |
| commit | f3e077a21cf87e3acbc692081a59f422f9d3ca9e (patch) | |
| tree | c1e6c4757b32f2416b968ce64c9a291cc1d9212e /configs/releng-openrc/efiboot/EFI/BOOT | |
| parent | acd25c913bface483531140e363923f49c5fef8d (diff) | |
sync with archiso
Imported changes:
f34c957 (HEAD -> master, origin/master, origin/HEAD) Calculate required efiboot.img size instead of hardcoding it
8c04704 Split SYSLINUX configuration into per-kernel configuration files
8276616 archiso/mkarchiso: do not hardcode the kernel and initramfs file names
83e4cb9 Use the same file paths in both ISO 9660 and FAT
136152e Do not rename the initramfs image
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'configs/releng-openrc/efiboot/EFI/BOOT')
| -rw-r--r-- | configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-cd.conf | 8 | ||||
| -rw-r--r-- | configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-linux-libre.conf (renamed from configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-usb.conf) | 2 | ||||
| -rw-r--r-- | configs/releng-openrc/efiboot/EFI/BOOT/refind.conf | 4 |
3 files changed, 3 insertions, 11 deletions
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 deleted file mode 100644 index 1bb9fe6..0000000 --- a/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-cd.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -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-linux-libre.conf index 4958c02..b49dd6e 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-linux-libre.conf @@ -3,6 +3,6 @@ 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 + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.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 cc8723d..1380e2f 100644 --- a/configs/releng-openrc/efiboot/EFI/BOOT/refind.conf +++ b/configs/releng-openrc/efiboot/EFI/BOOT/refind.conf @@ -5,5 +5,5 @@ scanfor manual showtools shell firmware reboot shutdown timeout 3 -include entries/parabolaiso-x86_64.conf -default_selection entries/parabolaiso-x86_64.conf +include entries/parabolaiso-x86_64-linux-libre.conf +default_selection entries/parabolaiso-x86_64-linux-libre.conf |