diff options
Diffstat (limited to 'configs')
38 files changed, 55 insertions, 81 deletions
diff --git a/configs/baseline/airootfs/etc/mkinitcpio.d/linux-libre.preset b/configs/baseline/airootfs/etc/mkinitcpio.d/linux-libre.preset index 782d1cd..db31d05 100644 --- a/configs/baseline/airootfs/etc/mkinitcpio.d/linux-libre.preset +++ b/configs/baseline/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/baseline/syslinux/syslinux-linux-libre.cfg b/configs/baseline/syslinux/syslinux-linux-libre.cfg new file mode 100644 index 0000000..af7fbb6 --- /dev/null +++ b/configs/baseline/syslinux/syslinux-linux-libre.cfg @@ -0,0 +1,8 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +LABEL parabola +MENU LABEL Parabola GNU/Linux-libre +LINUX boot/%ARCH%/vmlinuz-linux-libre +INITRD boot/%ARCH%/initramfs-linux-libre.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg index 3f7a85d..5eb5adf 100644 --- a/configs/baseline/syslinux/syslinux.cfg +++ b/configs/baseline/syslinux/syslinux.cfg @@ -8,8 +8,4 @@ MENU CLEAR DEFAULT parabola TIMEOUT 30 -LABEL parabola -MENU LABEL Parabola GNU/Linux-libre -LINUX boot/%ARCH%/vmlinuz-linux-libre -INITRD boot/%ARCH%/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% +INCLUDE boot/syslinux/syslinux-linux-libre.cfg diff --git a/configs/lxde-openrc/airootfs/etc/mkinitcpio.d/linux-libre.preset b/configs/lxde-openrc/airootfs/etc/mkinitcpio.d/linux-libre.preset index 782d1cd..db31d05 100644 --- a/configs/lxde-openrc/airootfs/etc/mkinitcpio.d/linux-libre.preset +++ b/configs/lxde-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/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-cd.conf b/configs/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-cd.conf deleted file mode 100644 index 1bb9fe6..0000000 --- a/configs/lxde-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/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-usb.conf b/configs/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-linux-libre.conf index 4958c02..b49dd6e 100644 --- a/configs/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-usb.conf +++ b/configs/lxde-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/lxde-openrc/efiboot/EFI/BOOT/refind.conf b/configs/lxde-openrc/efiboot/EFI/BOOT/refind.conf index cc8723d..1380e2f 100644 --- a/configs/lxde-openrc/efiboot/EFI/BOOT/refind.conf +++ b/configs/lxde-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.cfg b/configs/lxde-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg index 9f7e650..2cc63f1 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_pxe32.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg @@ -8,7 +8,7 @@ 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 +INITRD boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 @@ -19,7 +19,7 @@ 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 +INITRD boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 @@ -30,6 +30,6 @@ 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 +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_pxe64.cfg b/configs/lxde-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg index 1d3d67e..0fd9fa6 100644 --- a/configs/releng/syslinux/parabolaiso_pxe64.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg @@ -8,7 +8,7 @@ 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 +INITRD boot/x86_64/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 @@ -19,7 +19,7 @@ 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 +INITRD boot/x86_64/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 @@ -30,6 +30,6 @@ 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 +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/lxde-openrc/syslinux/parabolaiso_sys32.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg index da6f10a..da6f10a 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_sys32.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg diff --git a/configs/lxde-openrc/syslinux/parabolaiso_sys64.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg index 265464a..265464a 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_sys64.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg 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-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 diff --git a/configs/releng/syslinux/parabolaiso_pxe32.cfg b/configs/releng-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg index 9f7e650..2cc63f1 100644 --- a/configs/releng/syslinux/parabolaiso_pxe32.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg @@ -8,7 +8,7 @@ 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 +INITRD boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 @@ -19,7 +19,7 @@ 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 +INITRD boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 @@ -30,6 +30,6 @@ 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 +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_pxe64.cfg b/configs/releng-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg index 1d3d67e..0fd9fa6 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_pxe64.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg @@ -8,7 +8,7 @@ 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 +INITRD boot/x86_64/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 @@ -19,7 +19,7 @@ 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 +INITRD boot/x86_64/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 @@ -30,6 +30,6 @@ 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 +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_sys32.cfg b/configs/releng-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg index da6f10a..da6f10a 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_sys32.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg diff --git a/configs/releng-openrc/syslinux/parabolaiso_sys64.cfg b/configs/releng-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg index 265464a..265464a 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_sys64.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg 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-usb.conf b/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf index 7976b33..5f15e97 100644 --- a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-usb.conf +++ b/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf @@ -3,5 +3,5 @@ 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 +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.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/lxde-openrc/syslinux/parabolaiso_pxe32.cfg b/configs/releng/syslinux/parabolaiso_pxe32-linux-libre.cfg index 9f7e650..2cc63f1 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_pxe32.cfg +++ b/configs/releng/syslinux/parabolaiso_pxe32-linux-libre.cfg @@ -8,7 +8,7 @@ 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 +INITRD boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 @@ -19,7 +19,7 @@ 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 +INITRD boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 @@ -30,6 +30,6 @@ 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 +INITRD boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify SYSAPPEND 3 diff --git a/configs/talkingparabola/syslinux/parabolaiso_pxe64.cfg b/configs/releng/syslinux/parabolaiso_pxe64-linux-libre.cfg index 1d3d67e..0fd9fa6 100644 --- a/configs/talkingparabola/syslinux/parabolaiso_pxe64.cfg +++ b/configs/releng/syslinux/parabolaiso_pxe64-linux-libre.cfg @@ -8,7 +8,7 @@ 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 +INITRD boot/x86_64/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 @@ -19,7 +19,7 @@ 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 +INITRD boot/x86_64/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 @@ -30,6 +30,6 @@ 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 +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_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.cfg b/configs/releng/syslinux/parabolaiso_sys32-linux-libre.cfg index da6f10a..80fcca0 100644 --- a/configs/releng/syslinux/parabolaiso_sys32.cfg +++ b/configs/releng/syslinux/parabolaiso_sys32-linux-libre.cfg @@ -10,5 +10,5 @@ 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 +INITRD boot/i686/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-linux-libre.cfg index 265464a..853bb8d 100644 --- a/configs/releng/syslinux/parabolaiso_sys64.cfg +++ b/configs/releng/syslinux/parabolaiso_sys64-linux-libre.cfg @@ -11,5 +11,5 @@ 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 +INITRD boot/x86_64/initramfs-linux-libre.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 diff --git a/configs/talkingparabola/airootfs/etc/mkinitcpio.d/linux-libre.preset b/configs/talkingparabola/airootfs/etc/mkinitcpio.d/linux-libre.preset index 782d1cd..db31d05 100644 --- a/configs/talkingparabola/airootfs/etc/mkinitcpio.d/linux-libre.preset +++ b/configs/talkingparabola/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/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-usb.conf b/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf index 9d88638..87e14df 100644 --- a/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-usb.conf +++ b/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf @@ -3,5 +3,5 @@ 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 +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/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 diff --git a/configs/talkingparabola/syslinux/parabolaiso_pxe32.cfg b/configs/talkingparabola/syslinux/parabolaiso_pxe32-linux-libre.cfg index 9f7e650..2cc63f1 100644 --- a/configs/talkingparabola/syslinux/parabolaiso_pxe32.cfg +++ b/configs/talkingparabola/syslinux/parabolaiso_pxe32-linux-libre.cfg @@ -8,7 +8,7 @@ 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 +INITRD boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 @@ -19,7 +19,7 @@ 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 +INITRD boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 @@ -30,6 +30,6 @@ 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 +INITRD boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify SYSAPPEND 3 diff --git a/configs/lxde-openrc/syslinux/parabolaiso_pxe64.cfg b/configs/talkingparabola/syslinux/parabolaiso_pxe64-linux-libre.cfg index 1d3d67e..0fd9fa6 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_pxe64.cfg +++ b/configs/talkingparabola/syslinux/parabolaiso_pxe64-linux-libre.cfg @@ -8,7 +8,7 @@ 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 +INITRD boot/x86_64/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 @@ -19,7 +19,7 @@ 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 +INITRD boot/x86_64/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 @@ -30,6 +30,6 @@ 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 +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/talkingparabola/syslinux/parabolaiso_sys32.cfg b/configs/talkingparabola/syslinux/parabolaiso_sys32-linux-libre.cfg index e791d82..e791d82 100644 --- a/configs/talkingparabola/syslinux/parabolaiso_sys32.cfg +++ b/configs/talkingparabola/syslinux/parabolaiso_sys32-linux-libre.cfg diff --git a/configs/talkingparabola/syslinux/parabolaiso_sys64.cfg b/configs/talkingparabola/syslinux/parabolaiso_sys64-linux-libre.cfg index c235929..c235929 100644 --- a/configs/talkingparabola/syslinux/parabolaiso_sys64.cfg +++ b/configs/talkingparabola/syslinux/parabolaiso_sys64-linux-libre.cfg |