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 --- .../airootfs/etc/mkinitcpio.d/linux-libre.preset | 2 +- .../EFI/BOOT/entries/parabolaiso-x86_64-cd.conf | 8 ----- .../entries/parabolaiso-x86_64-linux-libre.conf | 8 +++++ .../EFI/BOOT/entries/parabolaiso-x86_64-usb.conf | 8 ----- configs/releng-openrc/efiboot/EFI/BOOT/refind.conf | 4 +-- .../syslinux/parabolaiso_pxe32-linux-libre.cfg | 35 ++++++++++++++++++++++ .../releng-openrc/syslinux/parabolaiso_pxe32.cfg | 35 ---------------------- .../syslinux/parabolaiso_pxe64-linux-libre.cfg | 35 ++++++++++++++++++++++ .../releng-openrc/syslinux/parabolaiso_pxe64.cfg | 35 ---------------------- .../syslinux/parabolaiso_sys32-linux-libre.cfg | 14 +++++++++ .../releng-openrc/syslinux/parabolaiso_sys32.cfg | 14 --------- .../syslinux/parabolaiso_sys64-linux-libre.cfg | 15 ++++++++++ .../releng-openrc/syslinux/parabolaiso_sys64.cfg | 15 ---------- 13 files changed, 110 insertions(+), 118 deletions(-) delete mode 100644 configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-cd.conf create mode 100644 configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-linux-libre.conf delete mode 100644 configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-usb.conf create mode 100644 configs/releng-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg delete mode 100644 configs/releng-openrc/syslinux/parabolaiso_pxe32.cfg create mode 100644 configs/releng-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg delete mode 100644 configs/releng-openrc/syslinux/parabolaiso_pxe64.cfg create mode 100644 configs/releng-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg delete mode 100644 configs/releng-openrc/syslinux/parabolaiso_sys32.cfg create mode 100644 configs/releng-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg delete mode 100644 configs/releng-openrc/syslinux/parabolaiso_sys64.cfg (limited to 'configs/releng-openrc') diff --git a/configs/releng-openrc/airootfs/etc/mkinitcpio.d/linux-libre.preset b/configs/releng-openrc/airootfs/etc/mkinitcpio.d/linux-libre.preset index 782d1cd..db31d05 100644 --- a/configs/releng-openrc/airootfs/etc/mkinitcpio.d/linux-libre.preset +++ b/configs/releng-openrc/airootfs/etc/mkinitcpio.d/linux-libre.preset @@ -8,4 +8,4 @@ PRESETS=('parabolaiso') ALL_kver='/boot/vmlinuz-linux-libre' ALL_config='/etc/mkinitcpio.conf' -parabolaiso_image="/boot/parabolaiso.img" +parabolaiso_image="/boot/initramfs-linux-libre.img" 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-linux-libre.conf b/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-linux-libre.conf new file mode 100644 index 0000000..b49dd6e --- /dev/null +++ b/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-linux-libre.conf @@ -0,0 +1,8 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +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/initramfs-linux-libre.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 deleted file mode 100644 index 4958c02..0000000 --- a/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-usb.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 /%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 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 diff --git a/configs/releng-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg b/configs/releng-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg new file mode 100644 index 0000000..2cc63f1 --- /dev/null +++ b/configs/releng-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg @@ -0,0 +1,35 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +LABEL parabola32_nbd +TEXT HELP +Boot the Parabola GNU/Linux-libre (i686) live medium (Using NBD). +It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +ENDTEXT +MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD) +LINUX boot/i686/vmlinuz-linux-libre +INITRD boot/i686/initramfs-linux-libre.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify +SYSAPPEND 3 + +LABEL parabola32_nfs +TEXT HELP +Boot the Parabola GNU/Linux-libre (i686) live medium (Using NFS). +It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +ENDTEXT +MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NFS) +LINUX boot/i686/vmlinuz-linux-libre +INITRD boot/i686/initramfs-linux-libre.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify +SYSAPPEND 3 + +LABEL parabola32_http +TEXT HELP +Boot the Parabola GNU/Linux-libre (i686) live medium (Using HTTP). +It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +ENDTEXT +MENU LABEL Boot Parabola GNU/Linux-libre (i686) (HTTP) +LINUX boot/i686/vmlinuz-linux-libre +INITRD boot/i686/initramfs-linux-libre.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify +SYSAPPEND 3 diff --git a/configs/releng-openrc/syslinux/parabolaiso_pxe32.cfg b/configs/releng-openrc/syslinux/parabolaiso_pxe32.cfg deleted file mode 100644 index 9f7e650..0000000 --- a/configs/releng-openrc/syslinux/parabolaiso_pxe32.cfg +++ /dev/null @@ -1,35 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -LABEL parabola32_nbd -TEXT HELP -Boot the Parabola GNU/Linux-libre (i686) live medium (Using NBD). -It allows you to install Parabola GNU/Linux-libre or perform system maintenance. -ENDTEXT -MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD) -LINUX boot/i686/vmlinuz-linux-libre -INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify -SYSAPPEND 3 - -LABEL parabola32_nfs -TEXT HELP -Boot the Parabola GNU/Linux-libre (i686) live medium (Using NFS). -It allows you to install Parabola GNU/Linux-libre or perform system maintenance. -ENDTEXT -MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NFS) -LINUX boot/i686/vmlinuz-linux-libre -INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify -SYSAPPEND 3 - -LABEL parabola32_http -TEXT HELP -Boot the Parabola GNU/Linux-libre (i686) live medium (Using HTTP). -It allows you to install Parabola GNU/Linux-libre or perform system maintenance. -ENDTEXT -MENU LABEL Boot Parabola GNU/Linux-libre (i686) (HTTP) -LINUX boot/i686/vmlinuz-linux-libre -INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify -SYSAPPEND 3 diff --git a/configs/releng-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg b/configs/releng-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg new file mode 100644 index 0000000..0fd9fa6 --- /dev/null +++ b/configs/releng-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg @@ -0,0 +1,35 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +LABEL parabola64_nbd +TEXT HELP +Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NBD). +It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +ENDTEXT +MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NBD) +LINUX boot/x86_64/vmlinuz-linux-libre +INITRD boot/x86_64/initramfs-linux-libre.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify +SYSAPPEND 3 + +LABEL parabola64_nfs +TEXT HELP +Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NFS). +It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +ENDTEXT +MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NFS) +LINUX boot/x86_64/vmlinuz-linux-libre +INITRD boot/x86_64/initramfs-linux-libre.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify +SYSAPPEND 3 + +LABEL parabola64_http +TEXT HELP +Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using HTTP). +It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +ENDTEXT +MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (HTTP) +LINUX boot/x86_64/vmlinuz-linux-libre +INITRD boot/x86_64/initramfs-linux-libre.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify +SYSAPPEND 3 diff --git a/configs/releng-openrc/syslinux/parabolaiso_pxe64.cfg b/configs/releng-openrc/syslinux/parabolaiso_pxe64.cfg deleted file mode 100644 index 1d3d67e..0000000 --- a/configs/releng-openrc/syslinux/parabolaiso_pxe64.cfg +++ /dev/null @@ -1,35 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -LABEL parabola64_nbd -TEXT HELP -Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NBD). -It allows you to install Parabola GNU/Linux-libre or perform system maintenance. -ENDTEXT -MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NBD) -LINUX boot/x86_64/vmlinuz-linux-libre -INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify -SYSAPPEND 3 - -LABEL parabola64_nfs -TEXT HELP -Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NFS). -It allows you to install Parabola GNU/Linux-libre or perform system maintenance. -ENDTEXT -MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NFS) -LINUX boot/x86_64/vmlinuz-linux-libre -INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify -SYSAPPEND 3 - -LABEL parabola64_http -TEXT HELP -Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using HTTP). -It allows you to install Parabola GNU/Linux-libre or perform system maintenance. -ENDTEXT -MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (HTTP) -LINUX boot/x86_64/vmlinuz-linux-libre -INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify -SYSAPPEND 3 diff --git a/configs/releng-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg b/configs/releng-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg new file mode 100644 index 0000000..da6f10a --- /dev/null +++ b/configs/releng-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg @@ -0,0 +1,14 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +TIMEOUT 30 + +LABEL parabola32 +TEXT HELP +Boot the Parabola GNU/Linux-libre (i686) live medium. +It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +ENDTEXT +MENU LABEL Boot Parabola GNU/Linux-libre (i686) +LINUX boot/i686/vmlinuz-linux-libre +INITRD boot/i686/parabolaiso.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% diff --git a/configs/releng-openrc/syslinux/parabolaiso_sys32.cfg b/configs/releng-openrc/syslinux/parabolaiso_sys32.cfg deleted file mode 100644 index da6f10a..0000000 --- a/configs/releng-openrc/syslinux/parabolaiso_sys32.cfg +++ /dev/null @@ -1,14 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -TIMEOUT 30 - -LABEL parabola32 -TEXT HELP -Boot the Parabola GNU/Linux-libre (i686) live medium. -It allows you to install Parabola GNU/Linux-libre or perform system maintenance. -ENDTEXT -MENU LABEL Boot Parabola GNU/Linux-libre (i686) -LINUX boot/i686/vmlinuz-linux-libre -INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% diff --git a/configs/releng-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg b/configs/releng-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg new file mode 100644 index 0000000..265464a --- /dev/null +++ b/configs/releng-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg @@ -0,0 +1,15 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +DEFAULT parabola64 +TIMEOUT 30 + +LABEL parabola64 +TEXT HELP +Boot the Parabola GNU/Linux-libre (x86_64) live medium. +It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +ENDTEXT +MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) +LINUX boot/x86_64/vmlinuz-linux-libre +INITRD boot/x86_64/parabolaiso.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% diff --git a/configs/releng-openrc/syslinux/parabolaiso_sys64.cfg b/configs/releng-openrc/syslinux/parabolaiso_sys64.cfg deleted file mode 100644 index 265464a..0000000 --- a/configs/releng-openrc/syslinux/parabolaiso_sys64.cfg +++ /dev/null @@ -1,15 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -DEFAULT parabola64 -TIMEOUT 30 - -LABEL parabola64 -TEXT HELP -Boot the Parabola GNU/Linux-libre (x86_64) live medium. -It allows you to install Parabola GNU/Linux-libre or perform system maintenance. -ENDTEXT -MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) -LINUX boot/x86_64/vmlinuz-linux-libre -INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% -- cgit v1.2.2