From 66da86ee8c61262d28beaec01d6da212776e3099 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Sun, 12 Jun 2022 09:46:43 +0200 Subject: [PATCH] iso-cleanup Signed-off-by: Peter Jung --- archiso/airootfs/etc/mkinitcpio.conf | 2 +- .../airootfs/etc/pacman.d/cachyos-mirrorlist | 19 ++++ .../systemd-gpt-auto-generator | 1 - .../bluetooth.target.wants/bluetooth.service | 1 + .../etc/systemd/system/choose-mirror.service | 10 -- .../cloud-config.service | 1 - .../cloud-final.service | 1 - .../cloud-init-local.service | 1 - .../cloud-init.service | 1 - .../etc/systemd/system/dbus-org.bluez.service | 1 + .../system/dbus-org.freedesktop.Avahi.service | 1 + ...dbus-org.freedesktop.ModemManager1.service | 1 - .../dbus-org.freedesktop.network1.service | 1 - ...dbus-org.freedesktop.nm-dispatcher.service | 1 + .../dbus-org.freedesktop.resolve1.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 + .../NetworkManager-wait-online.service | 1 + .../systemd-networkd-wait-online.service | 1 - .../etc/systemd/system/pacman-init.service | 7 +- .../sockets.target.wants/avahi-daemon.socket | 1 + .../systemd-networkd.socket | 1 - .../livecd-alsa-unmuter.service | 1 - .../sysinit.target.wants/haveged.service | 1 + .../wait-for-only-one-interface.conf | 6 -- .../entries/01-archiso-x86_64-linux.conf | 3 +- .../entries/02-archiso-x86_64-linux-nv.conf | 3 +- archiso/packages.x86_64 | 97 ++++++++++--------- 40 files changed, 90 insertions(+), 120 deletions(-) create mode 100644 archiso/airootfs/etc/pacman.d/cachyos-mirrorlist delete mode 120000 archiso/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator create mode 120000 archiso/airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service delete mode 100644 archiso/airootfs/etc/systemd/system/choose-mirror.service delete mode 120000 archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service delete mode 120000 archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service delete mode 120000 archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service delete mode 120000 archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service create mode 120000 archiso/airootfs/etc/systemd/system/dbus-org.bluez.service create mode 120000 archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.Avahi.service delete mode 120000 archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service delete mode 120000 archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service create mode 120000 archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service delete mode 120000 archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service delete mode 100644 archiso/airootfs/etc/systemd/system/livecd-alsa-unmuter.service delete mode 100644 archiso/airootfs/etc/systemd/system/livecd-talk.service delete mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service create mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/avahi-daemon.service delete mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service delete mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service delete mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service delete mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service delete mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service delete mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service create mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/ntpd.service delete mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service delete mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service create 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/NetworkManager-wait-online.service delete mode 120000 archiso/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service create mode 120000 archiso/airootfs/etc/systemd/system/sockets.target.wants/avahi-daemon.socket delete mode 120000 archiso/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket delete mode 120000 archiso/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service create mode 120000 archiso/airootfs/etc/systemd/system/sysinit.target.wants/haveged.service delete 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/mkinitcpio.conf b/archiso/airootfs/etc/mkinitcpio.conf index 3b9e197..3c13b0a 100644 --- a/archiso/airootfs/etc/mkinitcpio.conf +++ b/archiso/airootfs/etc/mkinitcpio.conf @@ -4,7 +4,7 @@ # run. Advanced users may wish to specify all system modules # in this array. For instance: # MODULES=(piix ide_disk reiserfs) -MODULES=() +MODULES=(vmd) # BINARIES # This setting includes any additional binaries a given user may diff --git a/archiso/airootfs/etc/pacman.d/cachyos-mirrorlist b/archiso/airootfs/etc/pacman.d/cachyos-mirrorlist new file mode 100644 index 0000000..0f62c5e --- /dev/null +++ b/archiso/airootfs/etc/pacman.d/cachyos-mirrorlist @@ -0,0 +1,19 @@ +###################################################### +#### #### +#### CachyOS Repository Mirrorlist #### +#### #### +###################################################### +#### Entry in file /etc/pacman.conf: +### [cachyos-desktop] +### Include = /etc/pacman.d/cachyos-mirrorlist +### [cachyos] +### Include = /etc/pacman.d/cachyos-mirrorlist +###################################################### +## Netherlands +Server = https://nl.cachyos.org/repo/$arch/$repo +## Germany +Server = https://aur.cachyos.org/repo/$arch/$repo +Server = https://mirror.cachyos.org/repo/$arch/$repo +Server = https://build.cachyos.org/repo/$arch/$repo +## Hungary much thanks to to ArchanfelHUN! +Server = https://hun.cachyos.org/repo/$arch/$repo diff --git a/archiso/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator b/archiso/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator deleted file mode 120000 index dc1dc0c..0000000 --- a/archiso/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator +++ /dev/null @@ -1 +0,0 @@ -/dev/null \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service b/archiso/airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service new file mode 120000 index 0000000..d256bfe --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/bluetooth.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/choose-mirror.service b/archiso/airootfs/etc/systemd/system/choose-mirror.service deleted file mode 100644 index b6a3562..0000000 --- a/archiso/airootfs/etc/systemd/system/choose-mirror.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Choose mirror from the kernel command line -ConditionKernelCommandLine=mirror - -[Service] -Type=oneshot -ExecStart=/usr/local/bin/choose-mirror - -[Install] -WantedBy=multi-user.target diff --git a/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service b/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service deleted file mode 120000 index ebc50f0..0000000 --- a/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/cloud-config.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service b/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service deleted file mode 120000 index 80fa3c8..0000000 --- a/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/cloud-final.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service b/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service deleted file mode 120000 index dd8e9f1..0000000 --- a/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/cloud-init-local.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service b/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service deleted file mode 120000 index 24c7a26..0000000 --- a/archiso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/cloud-init.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/dbus-org.bluez.service b/archiso/airootfs/etc/systemd/system/dbus-org.bluez.service new file mode 120000 index 0000000..d256bfe --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/dbus-org.bluez.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/bluetooth.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.Avahi.service b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.Avahi.service new file mode 120000 index 0000000..e7ae405 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.Avahi.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/avahi-daemon.service \ 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 deleted file mode 120000 index dcf7c8e..0000000 --- a/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index 4c158e6..0000000 --- a/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/systemd-networkd.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service new file mode 120000 index 0000000..a7e5cd4 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/NetworkManager-dispatcher.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 deleted file mode 120000 index 4f6ae34..0000000 --- a/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/systemd-resolved.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 deleted file mode 100644 index 03db4b9..0000000 --- a/archiso/airootfs/etc/systemd/system/livecd-alsa-unmuter.service +++ /dev/null @@ -1,13 +0,0 @@ -[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 deleted file mode 100644 index b38df22..0000000 --- a/archiso/airootfs/etc/systemd/system/livecd-talk.service +++ /dev/null @@ -1,20 +0,0 @@ -[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 deleted file mode 120000 index dcf7c8e..0000000 --- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service +++ /dev/null @@ -1 +0,0 @@ -/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 new file mode 120000 index 0000000..e7ae405 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/avahi-daemon.service @@ -0,0 +1 @@ +/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 deleted file mode 120000 index 2d8d256..0000000 --- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service +++ /dev/null @@ -1 +0,0 @@ -../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 deleted file mode 120000 index 20ac7b2..0000000 --- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index a7eac4a..0000000 --- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index eae19ef..0000000 --- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index 3625abd..0000000 --- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index b917481..0000000 --- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service +++ /dev/null @@ -1 +0,0 @@ -/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 new file mode 120000 index 0000000..d3bfc72 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/ntpd.service @@ -0,0 +1 @@ +/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 deleted file mode 120000 index 4c158e6..0000000 --- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index 4f6ae34..0000000 --- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service +++ /dev/null @@ -1 +0,0 @@ -/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 new file mode 120000 index 0000000..1303d33 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/vcheck.service @@ -0,0 +1 @@ +/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/NetworkManager-wait-online.service b/archiso/airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service new file mode 120000 index 0000000..b78b586 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/NetworkManager-wait-online.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 deleted file mode 120000 index 7d6ad92..0000000 --- a/archiso/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service +++ /dev/null @@ -1 +0,0 @@ -/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 b18f7f8..509a535 100644 --- a/archiso/airootfs/etc/systemd/system/pacman-init.service +++ b/archiso/airootfs/etc/systemd/system/pacman-init.service @@ -1,7 +1,10 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=Initializes Pacman keyring -Requires=etc-pacman.d-gnupg.mount -After=etc-pacman.d-gnupg.mount +Wants=haveged.service +After=haveged.service [Service] Type=oneshot 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 new file mode 120000 index 0000000..045b23d --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/sockets.target.wants/avahi-daemon.socket @@ -0,0 +1 @@ +/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 deleted file mode 120000 index 51942c8..0000000 --- a/archiso/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index 98c0fc8..0000000 --- a/archiso/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service +++ /dev/null @@ -1 +0,0 @@ -../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 new file mode 120000 index 0000000..546834f --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/sysinit.target.wants/haveged.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/haveged.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 deleted file mode 100644 index c9f9bce..0000000 --- a/archiso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf +++ /dev/null @@ -1,6 +0,0 @@ -# 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/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf index eba695c..ce6eed1 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,7 @@ title CachyOS x86_64 UEFI Default +sort-key 01 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes diff --git a/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf b/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf index eeb2dce..4cb9264 100644 --- a/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf +++ b/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf @@ -1,6 +1,7 @@ title CachyOS x86_64 UEFI NVIDIA (latest cards only) +sort-key 02 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index ee7237a..82712c9 100644 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -1,36 +1,33 @@ -accountsservice -adobe-source-han-sans-cn-fonts -adobe-source-han-sans-jp-fonts -adobe-source-han-sans-kr-fonts -alacritty -alsa-firmware -alsa-plugins +adobe-source-sans-pro-fonts alsa-utils +alacritty amd-ucode -archlinux-keyring +archinstall arch-install-scripts +archlinux-keyring +avahi b43-fwcutter base base-devel bash-completion bind bind-tools -brltty boost-libs +brltty broadcom-wl-dkms btrfs-progs cachy-browser -cachyos-calamares -cachyos-calamares-config +cachyos-calamares-systemd +cachyos-calamares-systemd-config cachyos-hello cachyos-hooks cachyos-kde-settings cachyos-kernel-manager -cachyos-packageinstaller cachyos-keyring cachyos-mirrorlist +cachyos-nord-gtk-theme-git cachyos-nord-kde-theme-git -cachyos-picom-config +cachyos-packageinstaller cachyos-rate-mirrors cachyos-v3-mirrorlist cantarell-fonts @@ -40,8 +37,9 @@ ckbcomp clonezilla cloud-init cmake +crda +cronie cryptsetup -device-mapper darkhttpd ddrescue dex @@ -49,7 +47,6 @@ dhclient dhcpcd dialog diffutils -discover dmidecode dmraid dnsmasq @@ -60,8 +57,6 @@ doxygen e2fsprogs edk2-shell efibootmgr -efitools -espeakup ethtool exfatprogs f2fs-tools @@ -86,12 +81,14 @@ gst-plugins-bad gst-plugins-ugly gtk-engine-murrine gtkmm3 +haveged hdparm -hyperv -hwdetect hwinfo +hyperv +imwheel inetutils intel-ucode +intltool inxi iptables-nft ipw2100-fw @@ -100,9 +97,10 @@ irssi iw iwd jfsutils +kinit kitty-terminfo konsole -kparts +kpmcore kscreen kvantum-qt5 kwin-scripts-forceblur @@ -118,7 +116,8 @@ linux-cachyos linux-cachyos-headers linux-cachyos-zfs linux-firmware -livecd-sounds +linux-firmware-marvell +lsb-release lsscsi lvm2 lynx @@ -133,22 +132,26 @@ mhwd-cachyos mhwd-nvidia-390xx mkinitcpio mkinitcpio-archiso -mkinitcpio-busybox mkinitcpio-nfs-utils +mkinitcpio-openswap mlocate +mobile-broadband-provider-info modemmanager mtools nano nano-syntax-highlighting nbd ndisc6 -netctl net-tools networkmanager +network-manager-applet +networkmanager-openconnect +networkmanager-openvpn +networkmanager-pptp +networkmanager-vpnc nfs-utils nilfs-utils nmap -cachyos-nord-gtk-theme-git noto-fonts nss-mdns ntfs-3g @@ -160,25 +163,32 @@ octopi openconnect opendesktop-fonts open-iscsi -open-vm-tools -openconnect openssh +open-vm-tools openvpn os-prober -parole +packagekit-qt5 partclone parted partimage paru -pavucontrol +pcsclite perl pipewire-alsa -pipewire-pulse pipewire-media-session +pipewire-pulse +plasma-browser-integration plasma-desktop plasma-framework -plasma-workspace +plasma-integration plasma-nm +plasma-pa +plasma-systemmonitor +plasma-thunderbolt +plasma-vault +plasma-workspace +polkit +polkit-kde-agent polkit-qt5 poppler-glib power-profiles-daemon @@ -188,39 +198,38 @@ profile-sync-daemon pv python python-defusedxml -pcsclite qemu-guest-agent qt5ct qt5-tools qt5-xmlpatterns realtime-privileges reflector -reflector-simple reiserfsprogs ristretto rp-pppoe rsync +rtkit rxvt-unicode-terminfo screen sddm sddm-kcm sdparm -rtkit sg3_utils smartmontools +smbclient snapper sof-firmware solid +spice-vdagent squashfs-tools sudo -sysfsutils syslinux systemd-resolvconf tcpdump terminus-font testdisk -tldr tpm2-tss +traceroute ttf-bitstream-vera ttf-dejavu ttf-liberation @@ -232,11 +241,7 @@ usbutils vim virtualbox-guest-utils vpnc -wayland -wayland-protocols wget -whois -wireguard-tools wireless-regdb wireless_tools wpa_supplicant @@ -244,22 +249,22 @@ wvdial xdg-user-dirs-gtk xdg-utils xed +xf86-input-elographics +xf86-input-evdev xf86-input-libinput +xf86-input-synaptics xf86-input-vmmouse -xf86-video-amdgpu -xf86-video-ati -xf86-video-intel -xf86-video-vesa +xf86-input-void +xf86-video-fbdev +xf86-video-openchrome +xf86-video-qxl xf86-video-vmware xfsprogs xl2tpd xorg-apps xorg-server -xorg-xdpyinfo xorg-xinit -xorg-xinput xorg-xkill -xorg-xrandr xorg-xrdb zfs-utils zsh