From 1de1ff1a297fc9cef517be263be4f873a1d01d65 Mon Sep 17 00:00:00 2001 From: David P Date: Sat, 1 Aug 2020 16:14:19 -0400 Subject: sync releng with archiso v46 and fix baseline mkinitcpio.conf hooks Signed-off-by: David P --- .../airootfs/etc/systemd/journald.conf.d/volatile-storage.conf | 3 +++ .../releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf | 3 +++ configs/releng/airootfs/etc/systemd/network/20-ethernet.network | 3 +++ configs/releng/airootfs/etc/systemd/network/20-wireless.network | 3 +++ configs/releng/airootfs/etc/systemd/system/choose-mirror.service | 3 +++ configs/releng/airootfs/etc/systemd/system/default.target | 1 - configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount | 3 +++ .../airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf | 3 +++ configs/releng/airootfs/etc/systemd/system/pacman-init.service | 3 +++ configs/releng/airootfs/etc/systemd/system/reflector.service | 6 ++++-- .../wait-for-only-one-interface.conf | 3 +++ 11 files changed, 31 insertions(+), 3 deletions(-) delete mode 120000 configs/releng/airootfs/etc/systemd/system/default.target (limited to 'configs/releng/airootfs/etc/systemd') diff --git a/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf b/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf index b69850d..3104779 100644 --- a/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf +++ b/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf @@ -1,2 +1,5 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Journal] Storage=volatile diff --git a/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf b/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf index f3ecb39..c6b17a4 100644 --- a/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf +++ b/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Login] HandleSuspendKey=ignore HandleHibernateKey=ignore diff --git a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network index 37878b0..efa309c 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network +++ b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Match] Name=en* Name=eth* diff --git a/configs/releng/airootfs/etc/systemd/network/20-wireless.network b/configs/releng/airootfs/etc/systemd/network/20-wireless.network index e1d624c..bf9ab9d 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-wireless.network +++ b/configs/releng/airootfs/etc/systemd/network/20-wireless.network @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Match] Name=wlp* Name=wlan* diff --git a/configs/releng/airootfs/etc/systemd/system/choose-mirror.service b/configs/releng/airootfs/etc/systemd/system/choose-mirror.service index b6a3562..b3e4847 100644 --- a/configs/releng/airootfs/etc/systemd/system/choose-mirror.service +++ b/configs/releng/airootfs/etc/systemd/system/choose-mirror.service @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=Choose mirror from the kernel command line ConditionKernelCommandLine=mirror diff --git a/configs/releng/airootfs/etc/systemd/system/default.target b/configs/releng/airootfs/etc/systemd/system/default.target deleted file mode 120000 index d321622..0000000 --- a/configs/releng/airootfs/etc/systemd/system/default.target +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/multi-user.target \ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount b/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount index 4eab551..f86a91d 100644 --- a/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount +++ b/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=Temporary /etc/pacman.d/gnupg directory diff --git a/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf index d1d8474..370735f 100644 --- a/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf +++ b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Service] ExecStart= ExecStart=-/sbin/agetty --autologin root --noclear %I 38400 linux diff --git a/configs/releng/airootfs/etc/systemd/system/pacman-init.service b/configs/releng/airootfs/etc/systemd/system/pacman-init.service index 3414ebc..e2511a9 100644 --- a/configs/releng/airootfs/etc/systemd/system/pacman-init.service +++ b/configs/releng/airootfs/etc/systemd/system/pacman-init.service @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=Initializes Pacman keyring Wants=haveged.service diff --git a/configs/releng/airootfs/etc/systemd/system/reflector.service b/configs/releng/airootfs/etc/systemd/system/reflector.service index dd37dd0..4058e36 100644 --- a/configs/releng/airootfs/etc/systemd/system/reflector.service +++ b/configs/releng/airootfs/etc/systemd/system/reflector.service @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=pacman mirrorlist update Wants=network-online.target @@ -6,7 +9,7 @@ ConditionKernelCommandLine=!mirror [Service] Type=oneshot -ExecStart=/usr/bin/reflector --protocol https --age 1 --sort rate --save /etc/pacman.d/mirrorlist +ExecStart=/usr/bin/reflector --protocol https --latest 70 --sort rate --save /etc/pacman.d/mirrorlist Restart=on-failure RestartSec=10 CacheDirectory=reflector @@ -27,7 +30,6 @@ ProtectKernelLogs=true ProtectKernelModules=true ProtectSystem=strict ReadWritePaths=/etc/pacman.d/mirrorlist -ReadOnlyPaths=/etc/reflector/reflector.conf RemoveIPC=true RestrictAddressFamilies=~AF_AX25 AF_IPX AF_APPLETALK AF_X25 AF_DECnet AF_KEY AF_NETLINK AF_PACKET AF_RDS AF_PPPOX AF_LLC AF_IB AF_MPLS AF_CAN AF_TIPC AF_BLUETOOTH AF_ALG AF_VSOCK AF_KCM AF_UNIX AF_XDP RestrictNamespaces=true diff --git a/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf index c875311..1b4c091 100644 --- a/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf +++ b/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Service] ExecStart= ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any -- cgit v1.2.2