From 50b2b4e56aa6f6dfaff61d7fcfa5da3ecad87167 Mon Sep 17 00:00:00 2001 From: David P Date: Tue, 6 Jul 2021 00:36:46 -0400 Subject: sync with archiso v55 Imported changes: 0bc6294 (tag: v55) Merge branch 'changelog/55' 5751de9 Add changelog for v55 50c5a02 Merge branch 'mr/118' d3b06a0 Add pv to the list of releng packages ef9207d Merge remote-tracking branch 'nl6720/baseline-erofs' 0b94b04 configs/baseline: use EROFS based image 85c7cbe Merge remote-tracking branch 'nl6720/networkd-replace-type-with-name' 3b2618f configs/releng/airootfs/etc/systemd/network/: match by globbing the interface name instead of matching the type 254194a Merge branch 'issues/135' 0e61ed0 Adjust documentation on IRC support channel e3a7f02 Merge remote-tracking branch 'sxw/copytoram' 31427ec Apply copytoram Boot Option Menu Entries also to releng 15f4ef4 Fence add_binary for pv 9c783a8 Reorder UEFI boot menu entries 16742d1 Update README.bootparams c9cdb6d Apply 1 suggestion(s) to 1 file(s) bb503b9 add optional pv tool Parabola changes: * mkparabolaiso: fix _run_once function Signed-off-by: David P --- .../efiboot/loader/entries/01-parabolaiso-x86_64-linux-libre.conf | 7 +++++++ .../loader/entries/02-parabolaiso-x86_64-speech-linux-libre.conf | 7 +++++++ .../loader/entries/03-parabolaiso-x86_64-ram-linux-libre.conf | 7 +++++++ .../efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf | 7 ------- .../loader/entries/parabolaiso-x86_64-speech-linux-libre.conf | 7 ------- configs/releng/efiboot/loader/loader.conf | 2 +- 6 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 configs/releng/efiboot/loader/entries/01-parabolaiso-x86_64-linux-libre.conf create mode 100644 configs/releng/efiboot/loader/entries/02-parabolaiso-x86_64-speech-linux-libre.conf create mode 100644 configs/releng/efiboot/loader/entries/03-parabolaiso-x86_64-ram-linux-libre.conf delete mode 100644 configs/releng/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf delete mode 100644 configs/releng/efiboot/loader/entries/parabolaiso-x86_64-speech-linux-libre.conf (limited to 'configs/releng/efiboot/loader') diff --git a/configs/releng/efiboot/loader/entries/01-parabolaiso-x86_64-linux-libre.conf b/configs/releng/efiboot/loader/entries/01-parabolaiso-x86_64-linux-libre.conf new file mode 100644 index 0000000..5f15e97 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/01-parabolaiso-x86_64-linux-libre.conf @@ -0,0 +1,7 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +title Parabola GNU/Linux-libre install medium (x86_64, UEFI) +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img +options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/02-parabolaiso-x86_64-speech-linux-libre.conf b/configs/releng/efiboot/loader/entries/02-parabolaiso-x86_64-speech-linux-libre.conf new file mode 100644 index 0000000..ac42de8 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/02-parabolaiso-x86_64-speech-linux-libre.conf @@ -0,0 +1,7 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +title Parabola GNU/Linux-libre install medium (x86_64, UEFI) with speech +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img +options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% accessibility=on diff --git a/configs/releng/efiboot/loader/entries/03-parabolaiso-x86_64-ram-linux-libre.conf b/configs/releng/efiboot/loader/entries/03-parabolaiso-x86_64-ram-linux-libre.conf new file mode 100644 index 0000000..ad4eca4 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/03-parabolaiso-x86_64-ram-linux-libre.conf @@ -0,0 +1,7 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +title Parabola GNU/Linux-libre install medium (x86_64, UEFI, Copy to RAM) +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img +options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram diff --git a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf b/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf deleted file mode 100644 index 5f15e97..0000000 --- a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -title Parabola GNU/Linux-libre install medium (x86_64, UEFI) -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img -options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-speech-linux-libre.conf b/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-speech-linux-libre.conf deleted file mode 100644 index ac42de8..0000000 --- a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-speech-linux-libre.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -title Parabola GNU/Linux-libre install medium (x86_64, UEFI) with speech -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img -options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% accessibility=on diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf index 3f878d9..f16e80b 100644 --- a/configs/releng/efiboot/loader/loader.conf +++ b/configs/releng/efiboot/loader/loader.conf @@ -2,4 +2,4 @@ # SPDX-License-Identifier: GPL-3.0-or-later timeout 15 -default parabolaiso-x86_64-linux-libre.conf +default 01-parabolaiso-x86_64-linux-libre.conf -- cgit v1.2.2