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 +- .../loader/entries/parabolaiso-x86_64-cd.conf | 7 ----- .../entries/parabolaiso-x86_64-linux-libre.conf | 7 +++++ .../loader/entries/parabolaiso-x86_64-usb.conf | 7 ----- configs/releng/efiboot/loader/loader.conf | 2 +- .../syslinux/parabolaiso_pxe32-linux-libre.cfg | 35 ++++++++++++++++++++++ configs/releng/syslinux/parabolaiso_pxe32.cfg | 35 ---------------------- .../syslinux/parabolaiso_pxe64-linux-libre.cfg | 35 ++++++++++++++++++++++ configs/releng/syslinux/parabolaiso_pxe64.cfg | 35 ---------------------- .../releng/syslinux/parabolaiso_pxe_both_inc.cfg | 4 +-- .../syslinux/parabolaiso_sys32-linux-libre.cfg | 14 +++++++++ configs/releng/syslinux/parabolaiso_sys32.cfg | 14 --------- .../syslinux/parabolaiso_sys64-linux-libre.cfg | 15 ++++++++++ configs/releng/syslinux/parabolaiso_sys64.cfg | 15 ---------- configs/releng/syslinux/parabolaiso_sys_32_inc.cfg | 2 +- .../releng/syslinux/parabolaiso_sys_both_inc.cfg | 4 +-- 16 files changed, 113 insertions(+), 120 deletions(-) delete mode 100644 configs/releng/efiboot/loader/entries/parabolaiso-x86_64-cd.conf create mode 100644 configs/releng/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf delete mode 100644 configs/releng/efiboot/loader/entries/parabolaiso-x86_64-usb.conf create mode 100644 configs/releng/syslinux/parabolaiso_pxe32-linux-libre.cfg delete mode 100644 configs/releng/syslinux/parabolaiso_pxe32.cfg create mode 100644 configs/releng/syslinux/parabolaiso_pxe64-linux-libre.cfg delete mode 100644 configs/releng/syslinux/parabolaiso_pxe64.cfg create mode 100644 configs/releng/syslinux/parabolaiso_sys32-linux-libre.cfg delete mode 100644 configs/releng/syslinux/parabolaiso_sys32.cfg create mode 100644 configs/releng/syslinux/parabolaiso_sys64-linux-libre.cfg delete mode 100644 configs/releng/syslinux/parabolaiso_sys64.cfg (limited to 'configs/releng') diff --git a/configs/releng/airootfs/etc/mkinitcpio.d/linux-libre.preset b/configs/releng/airootfs/etc/mkinitcpio.d/linux-libre.preset index 782d1cd..db31d05 100644 --- a/configs/releng/airootfs/etc/mkinitcpio.d/linux-libre.preset +++ b/configs/releng/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/efiboot/loader/entries/parabolaiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-cd.conf deleted file mode 100644 index b2c78a4..0000000 --- a/configs/releng/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 install medium (x86_64, UEFI) -linux /EFI/parabolaiso/vmlinuz-linux-libre -initrd /EFI/parabolaiso/parabolaiso.img -options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% 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 new file mode 100644 index 0000000..5f15e97 --- /dev/null +++ b/configs/releng/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 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-usb.conf b/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-usb.conf deleted file mode 100644 index 7976b33..0000000 --- a/configs/releng/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 install medium (x86_64, UEFI) -linux /%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/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf index e0b73cd..99b52a9 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 3 -default parabolaiso-x86_64.conf +default parabolaiso-x86_64-linux-libre.conf diff --git a/configs/releng/syslinux/parabolaiso_pxe32-linux-libre.cfg b/configs/releng/syslinux/parabolaiso_pxe32-linux-libre.cfg new file mode 100644 index 0000000..2cc63f1 --- /dev/null +++ b/configs/releng/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/syslinux/parabolaiso_pxe32.cfg b/configs/releng/syslinux/parabolaiso_pxe32.cfg deleted file mode 100644 index 9f7e650..0000000 --- a/configs/releng/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/syslinux/parabolaiso_pxe64-linux-libre.cfg b/configs/releng/syslinux/parabolaiso_pxe64-linux-libre.cfg new file mode 100644 index 0000000..0fd9fa6 --- /dev/null +++ b/configs/releng/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/syslinux/parabolaiso_pxe64.cfg b/configs/releng/syslinux/parabolaiso_pxe64.cfg deleted file mode 100644 index 1d3d67e..0000000 --- a/configs/releng/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/syslinux/parabolaiso_pxe_both_inc.cfg b/configs/releng/syslinux/parabolaiso_pxe_both_inc.cfg index 0c5be94..549fd4c 100644 --- a/configs/releng/syslinux/parabolaiso_pxe_both_inc.cfg +++ b/configs/releng/syslinux/parabolaiso_pxe_both_inc.cfg @@ -2,6 +2,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later INCLUDE boot/syslinux/parabolaiso_head.cfg -INCLUDE boot/syslinux/parabolaiso_pxe64.cfg -INCLUDE boot/syslinux/parabolaiso_pxe32.cfg +INCLUDE boot/syslinux/parabolaiso_pxe64-linux-libre.cfg +INCLUDE boot/syslinux/parabolaiso_pxe32-linux-libre.cfg INCLUDE boot/syslinux/parabolaiso_tail.cfg diff --git a/configs/releng/syslinux/parabolaiso_sys32-linux-libre.cfg b/configs/releng/syslinux/parabolaiso_sys32-linux-libre.cfg new file mode 100644 index 0000000..80fcca0 --- /dev/null +++ b/configs/releng/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/initramfs-linux-libre.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% diff --git a/configs/releng/syslinux/parabolaiso_sys32.cfg b/configs/releng/syslinux/parabolaiso_sys32.cfg deleted file mode 100644 index da6f10a..0000000 --- a/configs/releng/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/syslinux/parabolaiso_sys64-linux-libre.cfg b/configs/releng/syslinux/parabolaiso_sys64-linux-libre.cfg new file mode 100644 index 0000000..853bb8d --- /dev/null +++ b/configs/releng/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/initramfs-linux-libre.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% diff --git a/configs/releng/syslinux/parabolaiso_sys64.cfg b/configs/releng/syslinux/parabolaiso_sys64.cfg deleted file mode 100644 index 265464a..0000000 --- a/configs/releng/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% diff --git a/configs/releng/syslinux/parabolaiso_sys_32_inc.cfg b/configs/releng/syslinux/parabolaiso_sys_32_inc.cfg index 1e7c196..402ab61 100644 --- a/configs/releng/syslinux/parabolaiso_sys_32_inc.cfg +++ b/configs/releng/syslinux/parabolaiso_sys_32_inc.cfg @@ -2,5 +2,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later INCLUDE boot/syslinux/parabolaiso_head.cfg -INCLUDE boot/syslinux/parabolaiso_sys32.cfg +INCLUDE boot/syslinux/parabolaiso_sys32-linux-libre.cfg INCLUDE boot/syslinux/parabolaiso_tail.cfg diff --git a/configs/releng/syslinux/parabolaiso_sys_both_inc.cfg b/configs/releng/syslinux/parabolaiso_sys_both_inc.cfg index 04f89d4..0febc5a 100644 --- a/configs/releng/syslinux/parabolaiso_sys_both_inc.cfg +++ b/configs/releng/syslinux/parabolaiso_sys_both_inc.cfg @@ -2,6 +2,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later INCLUDE boot/syslinux/parabolaiso_head.cfg -INCLUDE boot/syslinux/parabolaiso_sys64.cfg -INCLUDE boot/syslinux/parabolaiso_sys32.cfg +INCLUDE boot/syslinux/parabolaiso_sys64-linux-libre.cfg +INCLUDE boot/syslinux/parabolaiso_sys32-linux-libre.cfg INCLUDE boot/syslinux/parabolaiso_tail.cfg -- cgit v1.2.2