diff options
| author | David P <megver83@parabola.nu> | 2020-09-28 14:39:20 -0300 |
|---|---|---|
| committer | David P <megver83@parabola.nu> | 2020-09-28 14:49:39 -0300 |
| commit | f3e077a21cf87e3acbc692081a59f422f9d3ca9e (patch) | |
| tree | c1e6c4757b32f2416b968ce64c9a291cc1d9212e /configs/baseline | |
| parent | acd25c913bface483531140e363923f49c5fef8d (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/baseline')
| -rw-r--r-- | configs/baseline/airootfs/etc/mkinitcpio.d/linux-libre.preset | 2 | ||||
| -rw-r--r-- | configs/baseline/syslinux/syslinux-linux-libre.cfg | 8 | ||||
| -rw-r--r-- | configs/baseline/syslinux/syslinux.cfg | 6 |
3 files changed, 10 insertions, 6 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 |