diff options
author | David P <megver83@parabola.nu> | 2021-08-02 17:59:43 -0400 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2021-08-02 17:59:43 -0400 |
commit | e09959ed0aba19e6b7f6789c1c57632414c5ec4b (patch) | |
tree | eccdafaef03b09dc7f9c039a8257bfdc3cab30a6 /configs/releng-openrc | |
parent | f8233e405bc7851dc6f81c316b1100484421ffb2 (diff) |
sync with archiso v57
archiso:
a4691b8 (tag: v57) Merge branch 'changelog/57'
12c21b1 (origin/changelog/57) Add changelog for 57
0ccb4f8 Merge branch 'issues/143'
0fa1c0e (origin/issues/143) mkarchiso: Do not run _build_iso_base once
9462e4c Merge branch 'issues/117'
f4324e2 (origin/issues/117) Remove SPDX license identifier from releng configs
00a1e8e Remove SPDX license identifier from releng configs
a07ff5c Merge remote-tracking branch 'nl6720/bootmodes-2'
610ff2a mkarchiso: improve functions and comments
1cec901 Merge remote-tracking branch 'nl6720/RouteMetric'
8fa110e configs/*/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf: document why the drop-in file exists
c6a1ccc configs/releng/airootfs/etc/systemd/network/: move RouteMetric= from [DHCPv6] to [IPv6AcceptRA]
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'configs/releng-openrc')
31 files changed, 0 insertions, 85 deletions
diff --git a/configs/releng-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector b/configs/releng-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector index 7287520..76e84dd 100755 --- a/configs/releng-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector +++ b/configs/releng-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector @@ -1,6 +1,4 @@ #!/bin/bash -# -# SPDX-License-Identifier: GPL-3.0-or-later if [ "$2" == up ] && ! grep -qoP 'mirror=\K\S+' /proc/cmdline; then reflector \ diff --git a/configs/releng-openrc/airootfs/etc/conf.d/agetty.tty1 b/configs/releng-openrc/airootfs/etc/conf.d/agetty.tty1 index c2b62f5..997909c 100644 --- a/configs/releng-openrc/airootfs/etc/conf.d/agetty.tty1 +++ b/configs/releng-openrc/airootfs/etc/conf.d/agetty.tty1 @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - baud="38400" term_type="linux" agetty_options="--autologin root --noclear" diff --git a/configs/releng-openrc/airootfs/etc/conf.d/hostname b/configs/releng-openrc/airootfs/etc/conf.d/hostname index 6d381fc..5a912cd 100644 --- a/configs/releng-openrc/airootfs/etc/conf.d/hostname +++ b/configs/releng-openrc/airootfs/etc/conf.d/hostname @@ -1,4 +1 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - hostname="parabolaiso" diff --git a/configs/releng-openrc/airootfs/etc/elogind/logind.conf.d/do-not-suspend.conf b/configs/releng-openrc/airootfs/etc/elogind/logind.conf.d/do-not-suspend.conf index c6b17a4..f3ecb39 100644 --- a/configs/releng-openrc/airootfs/etc/elogind/logind.conf.d/do-not-suspend.conf +++ b/configs/releng-openrc/airootfs/etc/elogind/logind.conf.d/do-not-suspend.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Login] HandleSuspendKey=ignore HandleHibernateKey=ignore diff --git a/configs/releng-openrc/airootfs/etc/local.d/choose-mirror.start b/configs/releng-openrc/airootfs/etc/local.d/choose-mirror.start index fea21b8..be4293c 100755 --- a/configs/releng-openrc/airootfs/etc/local.d/choose-mirror.start +++ b/configs/releng-openrc/airootfs/etc/local.d/choose-mirror.start @@ -1,6 +1,4 @@ #!/bin/bash -# -# SPDX-License-Identifier: GPL-3.0-or-later # Choose mirror from the kernel command line grep -qoP 'mirror=\K\S+' /proc/cmdline && /usr/local/bin/choose-mirror diff --git a/configs/releng-openrc/airootfs/etc/local.d/etc-pacman.d-gnupg.start b/configs/releng-openrc/airootfs/etc/local.d/etc-pacman.d-gnupg.start index f705ece..8a7139a 100755 --- a/configs/releng-openrc/airootfs/etc/local.d/etc-pacman.d-gnupg.start +++ b/configs/releng-openrc/airootfs/etc/local.d/etc-pacman.d-gnupg.start @@ -1,6 +1,4 @@ #!/bin/bash -# -# SPDX-License-Identifier: GPL-3.0-or-later # Temporary /etc/pacman.d/gnupg directory fstype="$(findmnt /etc/pacman.d/gnupg -o FSTYPE -Un)" diff --git a/configs/releng-openrc/airootfs/etc/local.d/livecd-talk.start b/configs/releng-openrc/airootfs/etc/local.d/livecd-talk.start index f826cdd..69a8cc4 100755 --- a/configs/releng-openrc/airootfs/etc/local.d/livecd-talk.start +++ b/configs/releng-openrc/airootfs/etc/local.d/livecd-talk.start @@ -1,6 +1,4 @@ #!/bin/bash -# -# SPDX-License-Identifier: GPL-3.0-or-later if grep -qo 'accessibility=on' /proc/cmdline; then livecd-sound -u diff --git a/configs/releng-openrc/airootfs/etc/local.d/pacman-init.start b/configs/releng-openrc/airootfs/etc/local.d/pacman-init.start index 60fdd4d..fcb588d 100755 --- a/configs/releng-openrc/airootfs/etc/local.d/pacman-init.start +++ b/configs/releng-openrc/airootfs/etc/local.d/pacman-init.start @@ -1,6 +1,4 @@ #!/bin/bash -# -# SPDX-License-Identifier: GPL-3.0-or-later # Initializes Pacman keyring if ! find /etc/pacman.d/gnupg -mindepth 1 2>/dev/null | read -r; then diff --git a/configs/releng-openrc/airootfs/etc/locale.conf b/configs/releng-openrc/airootfs/etc/locale.conf index 9bf7aef..01ec548 100644 --- a/configs/releng-openrc/airootfs/etc/locale.conf +++ b/configs/releng-openrc/airootfs/etc/locale.conf @@ -1,4 +1 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - LANG=en_US.UTF-8 diff --git a/configs/releng-openrc/airootfs/etc/mkinitcpio.conf b/configs/releng-openrc/airootfs/etc/mkinitcpio.conf index efbff15..d637173 100644 --- a/configs/releng-openrc/airootfs/etc/mkinitcpio.conf +++ b/configs/releng-openrc/airootfs/etc/mkinitcpio.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - # vim:set ft=sh # MODULES # The following modules are loaded before any boot hooks are 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 db31d05..625a03d 100644 --- a/configs/releng-openrc/airootfs/etc/mkinitcpio.d/linux-libre.preset +++ b/configs/releng-openrc/airootfs/etc/mkinitcpio.d/linux-libre.preset @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - # mkinitcpio preset file for the 'linux-libre' package on parabolaiso PRESETS=('parabolaiso') diff --git a/configs/releng-openrc/efiboot/EFI/BOOT/entries/01-parabolaiso-x86_64-linux-libre.conf b/configs/releng-openrc/efiboot/EFI/BOOT/entries/01-parabolaiso-x86_64-linux-libre.conf index b49dd6e..7fec6be 100644 --- a/configs/releng-openrc/efiboot/EFI/BOOT/entries/01-parabolaiso-x86_64-linux-libre.conf +++ b/configs/releng-openrc/efiboot/EFI/BOOT/entries/01-parabolaiso-x86_64-linux-libre.conf @@ -1,6 +1,3 @@ -# -# 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 diff --git a/configs/releng-openrc/efiboot/EFI/BOOT/entries/02-parabolaiso-x86_64-speech-linux-libre.conf b/configs/releng-openrc/efiboot/EFI/BOOT/entries/02-parabolaiso-x86_64-speech-linux-libre.conf index 62167e7..e6e8ab6 100644 --- a/configs/releng-openrc/efiboot/EFI/BOOT/entries/02-parabolaiso-x86_64-speech-linux-libre.conf +++ b/configs/releng-openrc/efiboot/EFI/BOOT/entries/02-parabolaiso-x86_64-speech-linux-libre.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - menuentry "Parabola GNU/Linux-libre install medium (x86_64, UEFI) with speech" { loader /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img diff --git a/configs/releng-openrc/efiboot/EFI/BOOT/entries/03-parabolaiso-x86_64-ram-linux-libre.conf b/configs/releng-openrc/efiboot/EFI/BOOT/entries/03-parabolaiso-x86_64-ram-linux-libre.conf index 907169d..0c635af 100644 --- a/configs/releng-openrc/efiboot/EFI/BOOT/entries/03-parabolaiso-x86_64-ram-linux-libre.conf +++ b/configs/releng-openrc/efiboot/EFI/BOOT/entries/03-parabolaiso-x86_64-ram-linux-libre.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - menuentry "Parabola GNU/Linux-libre install medium (x86_64, UEFI, Copy to RAM)" { loader /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img diff --git a/configs/releng-openrc/efiboot/EFI/BOOT/refind.conf b/configs/releng-openrc/efiboot/EFI/BOOT/refind.conf index 9a59f11..599ee49 100644 --- a/configs/releng-openrc/efiboot/EFI/BOOT/refind.conf +++ b/configs/releng-openrc/efiboot/EFI/BOOT/refind.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - scanfor manual showtools shell firmware reboot shutdown diff --git a/configs/releng-openrc/packages.both b/configs/releng-openrc/packages.both index d423992..bdc2180 100644 --- a/configs/releng-openrc/packages.both +++ b/configs/releng-openrc/packages.both @@ -1,5 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later alsa-utils-openrc arch-install-scripts archinstall diff --git a/configs/releng-openrc/packages.x86_64 b/configs/releng-openrc/packages.x86_64 index ff68c5c..31579bc 100644 --- a/configs/releng-openrc/packages.x86_64 +++ b/configs/releng-openrc/packages.x86_64 @@ -1,4 +1,2 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later edk2-shell refind diff --git a/configs/releng-openrc/pacman.conf b/configs/releng-openrc/pacman.conf index 6a32938..f531d97 100644 --- a/configs/releng-openrc/pacman.conf +++ b/configs/releng-openrc/pacman.conf @@ -2,8 +2,6 @@ # /etc/pacman.conf # # See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later # # GENERAL OPTIONS diff --git a/configs/releng-openrc/syslinux/parabolaiso_head.cfg b/configs/releng-openrc/syslinux/parabolaiso_head.cfg index 99e8cd0..591097e 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_head.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_head.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - SERIAL 0 115200 UI vesamenu.c32 MENU TITLE Parabola GNU/Linux-libre diff --git a/configs/releng-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg b/configs/releng-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg index 8f1a5ac..9e0bb0e 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - LABEL parabola32_nbd TEXT HELP Boot the Parabola GNU/Linux-libre (i686) live medium (Using NBD). diff --git a/configs/releng-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg b/configs/releng-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg index 3e46234..71e70c5 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg @@ -1,6 +1,3 @@ -# -# 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). diff --git a/configs/releng-openrc/syslinux/parabolaiso_pxe_32_inc.cfg b/configs/releng-openrc/syslinux/parabolaiso_pxe_32_inc.cfg index 6b0cd85..e42cf87 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_pxe_32_inc.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_pxe_32_inc.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - INCLUDE parabolaiso_head.cfg INCLUDE parabolaiso_pxe32.cfg INCLUDE parabolaiso_tail.cfg diff --git a/configs/releng-openrc/syslinux/parabolaiso_pxe_both_inc.cfg b/configs/releng-openrc/syslinux/parabolaiso_pxe_both_inc.cfg index ed898b5..279fba1 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_pxe_both_inc.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_pxe_both_inc.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - INCLUDE parabolaiso_head.cfg INCLUDE parabolaiso_pxe64-linux-libre.cfg INCLUDE parabolaiso_pxe32-linux-libre.cfg diff --git a/configs/releng-openrc/syslinux/parabolaiso_pxe_choose.cfg b/configs/releng-openrc/syslinux/parabolaiso_pxe_choose.cfg index ad5a822..dcf16b6 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_pxe_choose.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_pxe_choose.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - DEFAULT choose LABEL choose diff --git a/configs/releng-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg b/configs/releng-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg index 8d938b7..4f0acb1 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - TIMEOUT 150 LABEL parabola32 diff --git a/configs/releng-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg b/configs/releng-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg index 234e363..cbf736e 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - LABEL parabola64 TEXT HELP Boot the Parabola GNU/Linux-libre install medium on BIOS. diff --git a/configs/releng-openrc/syslinux/parabolaiso_sys_32_inc.cfg b/configs/releng-openrc/syslinux/parabolaiso_sys_32_inc.cfg index b9306ed..bbe92a3 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_sys_32_inc.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_sys_32_inc.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - INCLUDE parabolaiso_head.cfg DEFAULT parabola32 diff --git a/configs/releng-openrc/syslinux/parabolaiso_sys_both_inc.cfg b/configs/releng-openrc/syslinux/parabolaiso_sys_both_inc.cfg index afb027d..1f54dde 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_sys_both_inc.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_sys_both_inc.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - INCLUDE parabolaiso_head.cfg DEFAULT parabola64 diff --git a/configs/releng-openrc/syslinux/parabolaiso_sys_choose.cfg b/configs/releng-openrc/syslinux/parabolaiso_sys_choose.cfg index cf814d9..41c0e06 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_sys_choose.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_sys_choose.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - DEFAULT choose LABEL choose diff --git a/configs/releng-openrc/syslinux/parabolaiso_tail.cfg b/configs/releng-openrc/syslinux/parabolaiso_tail.cfg index af172c0..e5339a2 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_tail.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_tail.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - LABEL existing TEXT HELP Boot an existing operating system. diff --git a/configs/releng-openrc/syslinux/syslinux.cfg b/configs/releng-openrc/syslinux/syslinux.cfg index 187eea5..2894460 100644 --- a/configs/releng-openrc/syslinux/syslinux.cfg +++ b/configs/releng-openrc/syslinux/syslinux.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - DEFAULT select LABEL select |