summaryrefslogtreecommitdiff
path: root/configs/talkingparabola
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-09-28 14:39:20 -0300
committerDavid P <megver83@parabola.nu>2020-09-28 14:49:39 -0300
commitf3e077a21cf87e3acbc692081a59f422f9d3ca9e (patch)
treec1e6c4757b32f2416b968ce64c9a291cc1d9212e /configs/talkingparabola
parentacd25c913bface483531140e363923f49c5fef8d (diff)
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 <megver83@parabola.nu>
Diffstat (limited to 'configs/talkingparabola')
-rw-r--r--configs/talkingparabola/airootfs/etc/mkinitcpio.d/linux-libre.preset2
-rw-r--r--configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-cd.conf7
-rw-r--r--configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf (renamed from configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-usb.conf)2
-rw-r--r--configs/talkingparabola/efiboot/loader/loader.conf2
-rw-r--r--configs/talkingparabola/syslinux/parabolaiso_pxe32-linux-libre.cfg (renamed from configs/talkingparabola/syslinux/parabolaiso_pxe32.cfg)6
-rw-r--r--configs/talkingparabola/syslinux/parabolaiso_pxe64-linux-libre.cfg (renamed from configs/talkingparabola/syslinux/parabolaiso_pxe64.cfg)6
-rw-r--r--configs/talkingparabola/syslinux/parabolaiso_sys32-linux-libre.cfg (renamed from configs/talkingparabola/syslinux/parabolaiso_sys32.cfg)0
-rw-r--r--configs/talkingparabola/syslinux/parabolaiso_sys64-linux-libre.cfg (renamed from configs/talkingparabola/syslinux/parabolaiso_sys64.cfg)0
8 files changed, 9 insertions, 16 deletions
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/talkingparabola/syslinux/parabolaiso_pxe64.cfg b/configs/talkingparabola/syslinux/parabolaiso_pxe64-linux-libre.cfg
index 1d3d67e..0fd9fa6 100644
--- a/configs/talkingparabola/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