archiso 57-1

2021-07-31 09:44:37 +02:00 · 2021-07-31 09:44:37 +02:00 · 836638c0d4
commit 836638c0d4
parent 674ee894fe
31 changed files with 30 additions and 95 deletions
--- a/archiso/airootfs/etc/hostname
+++ b/archiso/airootfs/etc/hostname
@ -1,3 +1 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
 archiso
--- a/archiso/airootfs/etc/locale.conf
+++ b/archiso/airootfs/etc/locale.conf
@ -1,4 +1 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 LANG=en_US.UTF-8
--- a/archiso/airootfs/etc/mkinitcpio.conf
+++ b/archiso/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
--- a/archiso/airootfs/etc/mkinitcpio.d/linux.preset
+++ b/archiso/airootfs/etc/mkinitcpio.d/linux.preset
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # mkinitcpio preset file for the 'linux' package on archiso

 PRESETS=('archiso')
--- a/archiso/airootfs/etc/motd
+++ b/archiso/airootfs/etc/motd
@ -1,5 +1,5 @@
 To install [38;2;23;147;209mArch Linux[0m follow the installation guide:
-https://wiki.archlinux.org/index.php/Installation_guide
+https://wiki.archlinux.org/title/Installation_guide

 For Wi-Fi, authenticate to the wireless network using the [35miwctl[0m utility.
 For mobile broadband (WWAN) modems, connect with the [35mmmcli[0m utility.
--- a/archiso/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf
+++ b/archiso/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf
@ -1,5 +1,2 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Journal]
 Storage=volatile
--- a/archiso/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf
+++ b/archiso/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Login]
 HandleSuspendKey=ignore
 HandleHibernateKey=ignore
--- a/archiso/airootfs/etc/systemd/network/20-ethernet.network
+++ b/archiso/airootfs/etc/systemd/network/20-ethernet.network
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Match]
 Name=en*
 Name=eth*
@ -9,8 +6,13 @@ Name=eth*
 DHCP=yes
 IPv6PrivacyExtensions=yes

+# systemd-networkd does not set per-interface-type default route metrics
+# https://github.com/systemd/systemd/issues/17698
+# Explicitly set route metric, so that Ethernet is preferred over Wi-Fi and Wi-Fi is preferred over mobile broadband.
+# Use values from NetworkManager. From nm_device_get_route_metric_default in
+# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/src/core/devices/nm-device.c
 [DHCPv4]
-RouteMetric=512
+RouteMetric=100

-[DHCPv6]
-RouteMetric=512
+[IPv6AcceptRA]
+RouteMetric=100
--- a/archiso/airootfs/etc/systemd/network/20-wlan.network
+++ b/archiso/airootfs/etc/systemd/network/20-wlan.network
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Match]
 Name=wl*

@ -8,8 +5,13 @@ Name=wl*
 DHCP=yes
 IPv6PrivacyExtensions=yes

+# systemd-networkd does not set per-interface-type default route metrics
+# https://github.com/systemd/systemd/issues/17698
+# Explicitly set route metric, so that Ethernet is preferred over Wi-Fi and Wi-Fi is preferred over mobile broadband.
+# Use values from NetworkManager. From nm_device_get_route_metric_default in
+# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/src/core/devices/nm-device.c
 [DHCPv4]
-RouteMetric=1024
+RouteMetric=600

-[DHCPv6]
-RouteMetric=1024
+[IPv6AcceptRA]
+RouteMetric=600
--- a/archiso/airootfs/etc/systemd/network/20-wwan.network
+++ b/archiso/airootfs/etc/systemd/network/20-wwan.network
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Match]
 Name=ww*

@ -8,8 +5,13 @@ Name=ww*
 DHCP=yes
 IPv6PrivacyExtensions=yes

+# systemd-networkd does not set per-interface-type default route metrics
+# https://github.com/systemd/systemd/issues/17698
+# Explicitly set route metric, so that Ethernet is preferred over Wi-Fi and Wi-Fi is preferred over mobile broadband.
+# Use values from NetworkManager. From nm_device_get_route_metric_default in
+# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/src/core/devices/nm-device.c
 [DHCPv4]
-RouteMetric=2048
+RouteMetric=700

-[DHCPv6]
-RouteMetric=2048
+[IPv6AcceptRA]
+RouteMetric=700
--- a/archiso/airootfs/etc/systemd/system/choose-mirror.service
+++ b/archiso/airootfs/etc/systemd/system/choose-mirror.service
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Unit]
 Description=Choose mirror from the kernel command line
 ConditionKernelCommandLine=mirror
--- a/archiso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount
+++ b/archiso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Unit]
 Description=Temporary /etc/pacman.d/gnupg directory

--- a/archiso/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf
+++ b/archiso/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Service]
 ExecStart=
 ExecStart=-/sbin/agetty --autologin root --noclear %I 38400 linux
--- a/archiso/airootfs/etc/systemd/system/livecd-alsa-unmuter.service
+++ b/archiso/airootfs/etc/systemd/system/livecd-alsa-unmuter.service
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Unit]
 Description=Unmute All Sound Card Controls For Use With The Live Arch Environment
 # This needs to run after the audio device becomes available.
--- a/archiso/airootfs/etc/systemd/system/livecd-talk.service
+++ b/archiso/airootfs/etc/systemd/system/livecd-talk.service
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Unit]
 Description=Screen reader service
 After=livecd-alsa-unmuter.service
--- a/archiso/airootfs/etc/systemd/system/pacman-init.service
+++ b/archiso/airootfs/etc/systemd/system/pacman-init.service
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Unit]
 Description=Initializes Pacman keyring
 Requires=etc-pacman.d-gnupg.mount
--- a/archiso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf
+++ b/archiso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf
@ -1,6 +1,6 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
+# Allow systemd-networkd-wait-online to succeed with one interface, otherwise, if multiple network interfaces exist,
+# network-online.target gets needlessly delayed.
+# See https://wiki.archlinux.org/title/systemd-networkd#systemd-networkd-wait-online
 [Service]
 ExecStart=
 ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any
--- a/archiso/airootfs/usr/local/bin/Installation_guide
+++ b/archiso/airootfs/usr/local/bin/Installation_guide
@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

-exec lynx 'https://wiki.archlinux.org/index.php/Installation_guide'
+exec lynx 'https://wiki.archlinux.org/title/Installation_guide'
--- a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf
+++ b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 title   Arch Linux install medium (x86_64, UEFI)
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
--- a/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf
+++ b/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 title   Arch Linux install medium (x86_64, UEFI) with speech
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
--- a/archiso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf
+++ b/archiso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 title   Arch Linux install medium (x86_64, UEFI, Copy to RAM)
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
--- a/archiso/efiboot/loader/loader.conf
+++ b/archiso/efiboot/loader/loader.conf
@ -1,5 +1,2 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 timeout 15
 default 01-archiso-x86_64-linux.conf
--- a/archiso/packages.x86_64
+++ b/archiso/packages.x86_64
@ -1,5 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
 alsa-utils
 amd-ucode
 arch-install-scripts
--- a/archiso/pacman.conf
+++ b/archiso/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
@ -34,6 +32,7 @@ Architecture = auto
 #UseSyslog
 #Color
 #NoProgressBar
+# We cannot check disk space from within a chroot environment
 #CheckSpace
 #VerbosePkgLists
 ParallelDownloads = 5
--- a/archiso/syslinux/archiso_head.cfg
+++ b/archiso/syslinux/archiso_head.cfg
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 SERIAL 0 115200
 UI vesamenu.c32
 MENU TITLE Arch Linux
--- a/archiso/syslinux/archiso_pxe-linux.cfg
+++ b/archiso/syslinux/archiso_pxe-linux.cfg
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 LABEL arch64_nbd
 TEXT HELP
 Boot the Arch Linux install medium using NBD.
--- a/archiso/syslinux/archiso_pxe.cfg
+++ b/archiso/syslinux/archiso_pxe.cfg
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 INCLUDE archiso_head.cfg

 INCLUDE archiso_pxe-linux.cfg
--- a/archiso/syslinux/archiso_sys-linux.cfg
+++ b/archiso/syslinux/archiso_sys-linux.cfg
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 LABEL arch64
 TEXT HELP
 Boot the Arch Linux install medium on BIOS.
--- a/archiso/syslinux/archiso_sys.cfg
+++ b/archiso/syslinux/archiso_sys.cfg
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 INCLUDE archiso_head.cfg

 DEFAULT arch64
--- a/archiso/syslinux/archiso_tail.cfg
+++ b/archiso/syslinux/archiso_tail.cfg
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 LABEL existing
 TEXT HELP
 Boot an existing operating system.
--- a/archiso/syslinux/syslinux.cfg
+++ b/archiso/syslinux/syslinux.cfg
@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 DEFAULT select

 LABEL select