From 215dda2c3548174ae38ef47e7b1daf26e040d2fa Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Thu, 13 Oct 2022 23:53:55 +0200 Subject: [PATCH] Sync with archiso Signed-off-by: Peter Jung --- archiso/airootfs/etc/resolv.conf | 1 + .../systemd-gpt-auto-generator | 1 + ...dbus-org.freedesktop.ModemManager1.service | 1 + .../dbus-org.freedesktop.network1.service | 1 + .../dbus-org.freedesktop.resolve1.service | 1 + .../dbus-org.freedesktop.timesync1.service | 1 + .../system/livecd-alsa-unmuter.service | 13 ++++++++++++ .../etc/systemd/system/livecd-talk.service | 20 +++++++++++++++++++ .../ModemManager.service | 1 + .../avahi-daemon.service | 1 - .../choose-mirror.service | 1 + .../hv_fcopy_daemon.service | 1 + .../hv_kvp_daemon.service | 1 + .../hv_vss_daemon.service | 1 + .../multi-user.target.wants/iwd.service | 1 + .../livecd-talk.service | 1 + .../multi-user.target.wants/ntpd.service | 1 - .../systemd-networkd.service | 1 + .../systemd-resolved.service | 1 + .../multi-user.target.wants/vcheck.service | 1 - .../systemd-networkd-wait-online.service | 1 + .../etc/systemd/system/pacman-init.service | 9 ++++----- .../system/reflector.service.d/archiso.conf | 6 ++++++ .../sockets.target.wants/avahi-daemon.socket | 1 - .../systemd-networkd.socket | 1 + .../livecd-alsa-unmuter.service | 1 + .../sysinit.target.wants/haveged.service | 1 - .../systemd-time-wait-sync.service | 1 + .../systemd-timesyncd.service | 1 + .../wait-for-only-one-interface.conf | 6 ++++++ 30 files changed, 69 insertions(+), 10 deletions(-) create mode 120000 archiso/airootfs/etc/resolv.conf create mode 120000 archiso/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator create mode 120000 archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service create mode 120000 archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service create mode 120000 archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service create mode 120000 archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service create mode 100644 archiso/airootfs/etc/systemd/system/livecd-alsa-unmuter.service create mode 100644 archiso/airootfs/etc/systemd/system/livecd-talk.service create mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service delete mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/avahi-daemon.service create mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service create mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service create mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service create mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service create mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service create mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service delete mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/ntpd.service create mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service create mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service delete mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/vcheck.service create mode 120000 archiso/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service create mode 100644 archiso/airootfs/etc/systemd/system/reflector.service.d/archiso.conf delete mode 120000 archiso/airootfs/etc/systemd/system/sockets.target.wants/avahi-daemon.socket create mode 120000 archiso/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket create mode 120000 archiso/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service delete mode 120000 archiso/airootfs/etc/systemd/system/sysinit.target.wants/haveged.service create mode 120000 archiso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service create mode 120000 archiso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service create mode 100644 archiso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf diff --git a/archiso/airootfs/etc/resolv.conf b/archiso/airootfs/etc/resolv.conf new file mode 120000 index 0000000..3639662 --- /dev/null +++ b/archiso/airootfs/etc/resolv.conf @@ -0,0 +1 @@ +/run/systemd/resolve/stub-resolv.conf \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator b/archiso/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator new file mode 120000 index 0000000..dc1dc0c --- /dev/null +++ b/archiso/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service new file mode 120000 index 0000000..dcf7c8e --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/ModemManager.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service new file mode 120000 index 0000000..4c158e6 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-networkd.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service new file mode 120000 index 0000000..4f6ae34 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-resolved.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service new file mode 120000 index 0000000..cd00411 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-timesyncd.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/livecd-alsa-unmuter.service b/archiso/airootfs/etc/systemd/system/livecd-alsa-unmuter.service new file mode 100644 index 0000000..03db4b9 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/livecd-alsa-unmuter.service @@ -0,0 +1,13 @@ +[Unit] +Description=Unmute All Sound Card Controls For Use With The Live Arch Environment +# This needs to run after the audio device becomes available. +Wants=systemd-udev-settle.service +After=systemd-udev-settle.service sound.target +ConditionKernelCommandLine=accessibility=on + +[Service] +Type=oneshot +ExecStart=/usr/local/bin/livecd-sound -u + +[Install] +WantedBy=sound.target diff --git a/archiso/airootfs/etc/systemd/system/livecd-talk.service b/archiso/airootfs/etc/systemd/system/livecd-talk.service new file mode 100644 index 0000000..b38df22 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/livecd-talk.service @@ -0,0 +1,20 @@ +[Unit] +Description=Screen reader service +After=livecd-alsa-unmuter.service +Before=getty@tty1.service +ConditionKernelCommandLine=accessibility=on + +[Service] +Type=oneshot +TTYPath=/dev/tty13 +ExecStartPre=/usr/bin/chvt 13 +ExecStart=/usr/local/bin/livecd-sound -p +ExecStartPost=/usr/bin/chvt 1 +ExecStartPost=systemctl start espeakup.service +StandardInput=tty +TTYVHangup=yes +TTYVTDisallocate=yes +RemainAfterExit=true + +[Install] +WantedBy=multi-user.target diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service new file mode 120000 index 0000000..dcf7c8e --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/ModemManager.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/avahi-daemon.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/avahi-daemon.service deleted file mode 120000 index e7ae405..0000000 --- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/avahi-daemon.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/avahi-daemon.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service new file mode 120000 index 0000000..2d8d256 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service @@ -0,0 +1 @@ +../choose-mirror.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service new file mode 120000 index 0000000..20ac7b2 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/hv_fcopy_daemon.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service new file mode 120000 index 0000000..a7eac4a --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/hv_kvp_daemon.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service new file mode 120000 index 0000000..eae19ef --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/hv_vss_daemon.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service new file mode 120000 index 0000000..3625abd --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/iwd.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service new file mode 120000 index 0000000..b917481 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service @@ -0,0 +1 @@ +/etc/systemd/system/livecd-talk.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/ntpd.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/ntpd.service deleted file mode 120000 index d3bfc72..0000000 --- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/ntpd.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/ntpd.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service new file mode 120000 index 0000000..4c158e6 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-networkd.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service new file mode 120000 index 0000000..4f6ae34 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-resolved.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/vcheck.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/vcheck.service deleted file mode 120000 index 1303d33..0000000 --- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/vcheck.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/virtual-machine-check.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service b/archiso/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service new file mode 120000 index 0000000..7d6ad92 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-networkd-wait-online.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/pacman-init.service b/archiso/airootfs/etc/systemd/system/pacman-init.service index 509a535..b824884 100644 --- a/archiso/airootfs/etc/systemd/system/pacman-init.service +++ b/archiso/airootfs/etc/systemd/system/pacman-init.service @@ -1,10 +1,9 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Unit] Description=Initializes Pacman keyring -Wants=haveged.service -After=haveged.service +Requires=etc-pacman.d-gnupg.mount +After=etc-pacman.d-gnupg.mount time-sync.target +BindsTo=etc-pacman.d-gnupg.mount +Before=archlinux-keyring-wkd-sync.service [Service] Type=oneshot diff --git a/archiso/airootfs/etc/systemd/system/reflector.service.d/archiso.conf b/archiso/airootfs/etc/systemd/system/reflector.service.d/archiso.conf new file mode 100644 index 0000000..de6664d --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/reflector.service.d/archiso.conf @@ -0,0 +1,6 @@ +[Unit] +ConditionKernelCommandLine=!mirror + +[Service] +Restart=on-failure +RestartSec=10 diff --git a/archiso/airootfs/etc/systemd/system/sockets.target.wants/avahi-daemon.socket b/archiso/airootfs/etc/systemd/system/sockets.target.wants/avahi-daemon.socket deleted file mode 120000 index 045b23d..0000000 --- a/archiso/airootfs/etc/systemd/system/sockets.target.wants/avahi-daemon.socket +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/avahi-daemon.socket \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/archiso/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket new file mode 120000 index 0000000..51942c8 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-networkd.socket \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service b/archiso/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service new file mode 120000 index 0000000..98c0fc8 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service @@ -0,0 +1 @@ +../livecd-alsa-unmuter.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/sysinit.target.wants/haveged.service b/archiso/airootfs/etc/systemd/system/sysinit.target.wants/haveged.service deleted file mode 120000 index 546834f..0000000 --- a/archiso/airootfs/etc/systemd/system/sysinit.target.wants/haveged.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/haveged.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service b/archiso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service new file mode 120000 index 0000000..cabf28b --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-time-wait-sync.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service b/archiso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service new file mode 120000 index 0000000..cd00411 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-timesyncd.service \ No newline at end of file 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 new file mode 100644 index 0000000..c9f9bce --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf @@ -0,0 +1,6 @@ +# 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