From 131dd35ab7a005e94368af679952c12282f4b18a Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Sat, 14 May 2022 06:09:41 +0200 Subject: [PATCH] sync with archiso Signed-off-by: Peter Jung --- .../systemd/system/dbus-org.freedesktop.nm-dispatcher.service | 1 - archiso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount | 4 ++-- .../system/multi-user.target.wants/hv_fcopy_daemon.service | 0 .../system/multi-user.target.wants/hv_kvp_daemon.service | 0 .../system/multi-user.target.wants/hv_vss_daemon.service | 0 .../systemd/system/multi-user.target.wants/vmtoolsd.service | 0 .../multi-user.target.wants/vmware-vmblock-fuse.service | 0 .../NetworkManager-wait-online.service | 1 - archiso/efiboot/loader/loader.conf | 2 +- archiso/packages.x86_64 | 4 +--- 10 files changed, 4 insertions(+), 8 deletions(-) delete mode 120000 archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service mode change 100644 => 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service mode change 100644 => 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service mode change 100644 => 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service mode change 100644 => 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service mode change 100644 => 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service delete mode 120000 archiso/airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service 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 deleted file mode 120000 index a7e5cd4..0000000 --- a/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/NetworkManager-dispatcher.service \ No newline at end of file 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 4eab551..0ba0e67 100644 --- a/archiso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount +++ b/archiso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount @@ -2,7 +2,7 @@ Description=Temporary /etc/pacman.d/gnupg directory [Mount] -What=tmpfs +What=ramfs Where=/etc/pacman.d/gnupg -Type=tmpfs +Type=ramfs Options=mode=0755 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 100644 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_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 deleted file mode 100644 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_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 deleted file mode 100644 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/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/vmtoolsd.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service deleted file mode 100644 index e0a11a7..0000000 --- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/vmtoolsd.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service new file mode 120000 index 0000000..e0a11a7 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/vmtoolsd.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service deleted file mode 100644 index 173f306..0000000 --- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/vmware-vmblock-fuse.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service new file mode 120000 index 0000000..173f306 --- /dev/null +++ b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/vmware-vmblock-fuse.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 deleted file mode 120000 index b78b586..0000000 --- a/archiso/airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/NetworkManager-wait-online.service \ No newline at end of file diff --git a/archiso/efiboot/loader/loader.conf b/archiso/efiboot/loader/loader.conf index fe48730..ae63487 100644 --- a/archiso/efiboot/loader/loader.conf +++ b/archiso/efiboot/loader/loader.conf @@ -1,2 +1,2 @@ -timeout 10 +timeout 15 default 01-archiso-x86_64-linux.conf diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index bc02a59..3f4b1dc 100644 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -7,10 +7,9 @@ alsa-firmware alsa-plugins alsa-utils amd-ucode -archinstall +archlinux-keyring arch-install-scripts ## Archive -archlinux-keyring b43-fwcutter base base-devel @@ -106,7 +105,6 @@ ipw2100-fw ipw2200-fw irssi iw -iwd jfsutils kitty-terminfo konsole