From f3e077a21cf87e3acbc692081a59f422f9d3ca9e Mon Sep 17 00:00:00 2001 From: David P Date: Mon, 28 Sep 2020 14:39:20 -0300 Subject: 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 --- .../efiboot/loader/entries/parabolaiso-x86_64-cd.conf | 7 ------- .../efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf | 7 +++++++ .../efiboot/loader/entries/parabolaiso-x86_64-usb.conf | 7 ------- configs/talkingparabola/efiboot/loader/loader.conf | 2 +- 4 files changed, 8 insertions(+), 15 deletions(-) delete mode 100644 configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-cd.conf create mode 100644 configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf delete mode 100644 configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-usb.conf (limited to 'configs/talkingparabola/efiboot') diff --git a/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-cd.conf b/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-cd.conf deleted file mode 100644 index 794bccd..0000000 --- a/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-cd.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -title Parabola GNU/Linux-libre parabolaiso x86_64 UEFI CD -linux /EFI/parabolaiso/vmlinuz-linux-libre -initrd /EFI/parabolaiso/parabolaiso.img -options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% speakup.synth=soft diff --git a/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf b/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf new file mode 100644 index 0000000..87e14df --- /dev/null +++ b/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf @@ -0,0 +1,7 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +title Parabola GNU/Linux-libre parabolaiso x86_64 UEFI USB +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img +options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% speakup.synth=soft diff --git a/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-usb.conf b/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-usb.conf deleted file mode 100644 index 9d88638..0000000 --- a/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-usb.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -title Parabola GNU/Linux-libre parabolaiso x86_64 UEFI USB -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz -initrd /%INSTALL_DIR%/boot/x86_64/parabolaiso.img -options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% speakup.synth=soft diff --git a/configs/talkingparabola/efiboot/loader/loader.conf b/configs/talkingparabola/efiboot/loader/loader.conf index e0b73cd..99b52a9 100644 --- a/configs/talkingparabola/efiboot/loader/loader.conf +++ b/configs/talkingparabola/efiboot/loader/loader.conf @@ -2,4 +2,4 @@ # SPDX-License-Identifier: GPL-3.0-or-later timeout 3 -default parabolaiso-x86_64.conf +default parabolaiso-x86_64-linux-libre.conf -- cgit v1.2.2