From 836638c0d4158d687e58b1aaaa24dd8b218cea8a Mon Sep 17 00:00:00 2001 From: Erik Dubois Date: Sat, 31 Jul 2021 09:44:37 +0200 Subject: [PATCH] archiso 57-1 --- archiso/airootfs/etc/hostname | 2 -- archiso/airootfs/etc/locale.conf | 3 --- archiso/airootfs/etc/mkinitcpio.conf | 3 --- archiso/airootfs/etc/mkinitcpio.d/linux.preset | 3 --- archiso/airootfs/etc/motd | 2 +- .../systemd/journald.conf.d/volatile-storage.conf | 3 --- .../etc/systemd/logind.conf.d/do-not-suspend.conf | 3 --- .../etc/systemd/network/20-ethernet.network | 14 ++++++++------ .../airootfs/etc/systemd/network/20-wlan.network | 14 ++++++++------ .../airootfs/etc/systemd/network/20-wwan.network | 14 ++++++++------ .../etc/systemd/system/choose-mirror.service | 3 --- .../etc/systemd/system/etc-pacman.d-gnupg.mount | 3 --- .../system/getty@tty1.service.d/autologin.conf | 3 --- .../etc/systemd/system/livecd-alsa-unmuter.service | 3 --- .../etc/systemd/system/livecd-talk.service | 3 --- .../etc/systemd/system/pacman-init.service | 3 --- .../wait-for-only-one-interface.conf | 6 +++--- archiso/airootfs/usr/local/bin/Installation_guide | 2 +- .../loader/entries/01-archiso-x86_64-linux.conf | 3 --- .../entries/02-archiso-x86_64-speech-linux.conf | 3 --- .../entries/03-archiso-x86_64-ram-linux.conf | 3 --- archiso/efiboot/loader/loader.conf | 3 --- archiso/packages.x86_64 | 2 -- archiso/pacman.conf | 3 +-- archiso/syslinux/archiso_head.cfg | 3 --- archiso/syslinux/archiso_pxe-linux.cfg | 3 --- archiso/syslinux/archiso_pxe.cfg | 3 --- archiso/syslinux/archiso_sys-linux.cfg | 3 --- archiso/syslinux/archiso_sys.cfg | 3 --- archiso/syslinux/archiso_tail.cfg | 3 --- archiso/syslinux/syslinux.cfg | 3 --- 31 files changed, 30 insertions(+), 95 deletions(-) diff --git a/archiso/airootfs/etc/hostname b/archiso/airootfs/etc/hostname index a5f866b..2dbe21e 100644 --- a/archiso/airootfs/etc/hostname +++ b/archiso/airootfs/etc/hostname @@ -1,3 +1 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later archiso diff --git a/archiso/airootfs/etc/locale.conf b/archiso/airootfs/etc/locale.conf index 9bf7aef..01ec548 100644 --- 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 diff --git a/archiso/airootfs/etc/mkinitcpio.conf b/archiso/airootfs/etc/mkinitcpio.conf index c37b19f..2de9623 100644 --- 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 diff --git a/archiso/airootfs/etc/mkinitcpio.d/linux.preset b/archiso/airootfs/etc/mkinitcpio.d/linux.preset index d35f137..9f67184 100644 --- 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') diff --git a/archiso/airootfs/etc/motd b/archiso/airootfs/etc/motd index 3f82850..1ddc9c3 100644 --- a/archiso/airootfs/etc/motd +++ b/archiso/airootfs/etc/motd @@ -1,5 +1,5 @@ To install Arch Linux 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 iwctl utility. For mobile broadband (WWAN) modems, connect with the mmcli utility. diff --git a/archiso/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf b/archiso/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf index 3104779..b69850d 100644 --- 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 diff --git a/archiso/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf b/archiso/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf index c6b17a4..f3ecb39 100644 --- 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 diff --git a/archiso/airootfs/etc/systemd/network/20-ethernet.network b/archiso/airootfs/etc/systemd/network/20-ethernet.network index 142c591..f2a7d60 100644 --- 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 diff --git a/archiso/airootfs/etc/systemd/network/20-wlan.network b/archiso/airootfs/etc/systemd/network/20-wlan.network index c164666..601d5b8 100644 --- 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 diff --git a/archiso/airootfs/etc/systemd/network/20-wwan.network b/archiso/airootfs/etc/systemd/network/20-wwan.network index 7fba35b..9104c24 100644 --- 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 diff --git a/archiso/airootfs/etc/systemd/system/choose-mirror.service b/archiso/airootfs/etc/systemd/system/choose-mirror.service index b3e4847..b6a3562 100644 --- 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 diff --git a/archiso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount b/archiso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount index f86a91d..4eab551 100644 --- 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 diff --git a/archiso/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/archiso/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf index 370735f..d1d8474 100644 --- 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 diff --git a/archiso/airootfs/etc/systemd/system/livecd-alsa-unmuter.service b/archiso/airootfs/etc/systemd/system/livecd-alsa-unmuter.service index 8c5317d..03db4b9 100644 --- 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. diff --git a/archiso/airootfs/etc/systemd/system/livecd-talk.service b/archiso/airootfs/etc/systemd/system/livecd-talk.service index d959ab3..b38df22 100644 --- 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 diff --git a/archiso/airootfs/etc/systemd/system/pacman-init.service b/archiso/airootfs/etc/systemd/system/pacman-init.service index f446a80..b18f7f8 100644 --- 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 diff --git 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 index 1b4c091..c9f9bce 100644 --- 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 diff --git a/archiso/airootfs/usr/local/bin/Installation_guide b/archiso/airootfs/usr/local/bin/Installation_guide index d790c3e..4266754 100755 --- 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' diff --git a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 1a14b11..d59262f 100644 --- 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 diff --git a/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf b/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf index 632c446..06f5466 100644 --- 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 diff --git a/archiso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf b/archiso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf index 9eba5a9..9c7a51a 100644 --- 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 diff --git a/archiso/efiboot/loader/loader.conf b/archiso/efiboot/loader/loader.conf index 4f6252f..ae63487 100644 --- 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 diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index 52b2054..d3b994b 100644 --- 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 diff --git a/archiso/pacman.conf b/archiso/pacman.conf index bd08156..618c8ef 100644 --- 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 diff --git a/archiso/syslinux/archiso_head.cfg b/archiso/syslinux/archiso_head.cfg index 9c8e706..1154f78 100644 --- 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 diff --git a/archiso/syslinux/archiso_pxe-linux.cfg b/archiso/syslinux/archiso_pxe-linux.cfg index 49b8c38..e8c9a7b 100644 --- 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. diff --git a/archiso/syslinux/archiso_pxe.cfg b/archiso/syslinux/archiso_pxe.cfg index b005cb1..b4c9a80 100644 --- 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 diff --git a/archiso/syslinux/archiso_sys-linux.cfg b/archiso/syslinux/archiso_sys-linux.cfg index a34d127..ccc31b3 100644 --- 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. diff --git a/archiso/syslinux/archiso_sys.cfg b/archiso/syslinux/archiso_sys.cfg index cab78f8..d93bcfe 100644 --- 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 diff --git a/archiso/syslinux/archiso_tail.cfg b/archiso/syslinux/archiso_tail.cfg index af172c0..e5339a2 100644 --- 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. diff --git a/archiso/syslinux/syslinux.cfg b/archiso/syslinux/syslinux.cfg index 847ab6b..cbda72f 100644 --- 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