From cec14d8b50f55fd077550f57988de41b0e1b4d63 Mon Sep 17 00:00:00 2001 From: Alexander Epaneshnikov Date: Tue, 29 Mar 2022 18:24:16 +0300 Subject: add needed files this fixes #167 --- .../releng/airootfs/etc/systemd/system/pacmanbeeper.service | 13 +++++++++++++ .../systemd/system/sound.target.wants/pacmanbeeper.service | 1 + 2 files changed, 14 insertions(+) create mode 100644 configs/releng/airootfs/etc/systemd/system/pacmanbeeper.service create mode 120000 configs/releng/airootfs/etc/systemd/system/sound.target.wants/pacmanbeeper.service (limited to 'configs/releng/airootfs/etc/systemd/system') diff --git a/configs/releng/airootfs/etc/systemd/system/pacmanbeeper.service b/configs/releng/airootfs/etc/systemd/system/pacmanbeeper.service new file mode 100644 index 0000000..8a6a41e --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/pacmanbeeper.service @@ -0,0 +1,13 @@ +[Unit] +Description=Play pacman tune +# for playing alert tunes via the built-in PC speaker (KDMKTONE, KIOCSOUND) +Wants=modprobe@pcspkr.service +After=modprobe@pcspkr.service + +[Service] +User=beep +Type=oneshot +ExecStart=/usr/local/bin/pacman-beep.sh + +[Install] +WantedBy=sound.target diff --git a/configs/releng/airootfs/etc/systemd/system/sound.target.wants/pacmanbeeper.service b/configs/releng/airootfs/etc/systemd/system/sound.target.wants/pacmanbeeper.service new file mode 120000 index 0000000..fc5ade0 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/sound.target.wants/pacmanbeeper.service @@ -0,0 +1 @@ +../pacmanbeeper.service \ No newline at end of file -- cgit v1.2.3-70-g09d2 From ee2a721cea8a1f230f570ae93bac8d94142cb6b1 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Mon, 4 Apr 2022 15:18:55 +0300 Subject: Revert "Merge remote-tracking branch 'origin/merge-requests/239'" People get scared by it. See https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/239#note_61954. This reverts commit b5011af3f4ac63214fdecef442550cce5ae4a971, reversing changes made to 07d8035624cff64e28f1148ddec9e970e26173da. --- .../releng/airootfs/etc/systemd/system/pacmanbeeper.service | 13 ------------- .../systemd/system/sound.target.wants/pacmanbeeper.service | 1 - configs/releng/airootfs/etc/sysusers.d/beep.conf | 2 -- .../releng/airootfs/etc/udev/rules.d/90-pcspkr-beep.rules | 2 -- configs/releng/airootfs/usr/local/bin/pacman-beep.sh | 3 --- configs/releng/packages.x86_64 | 1 - configs/releng/profiledef.sh | 1 - 7 files changed, 23 deletions(-) delete mode 100644 configs/releng/airootfs/etc/systemd/system/pacmanbeeper.service delete mode 120000 configs/releng/airootfs/etc/systemd/system/sound.target.wants/pacmanbeeper.service delete mode 100644 configs/releng/airootfs/etc/sysusers.d/beep.conf delete mode 100644 configs/releng/airootfs/etc/udev/rules.d/90-pcspkr-beep.rules delete mode 100755 configs/releng/airootfs/usr/local/bin/pacman-beep.sh (limited to 'configs/releng/airootfs/etc/systemd/system') diff --git a/configs/releng/airootfs/etc/systemd/system/pacmanbeeper.service b/configs/releng/airootfs/etc/systemd/system/pacmanbeeper.service deleted file mode 100644 index 8a6a41e..0000000 --- a/configs/releng/airootfs/etc/systemd/system/pacmanbeeper.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Play pacman tune -# for playing alert tunes via the built-in PC speaker (KDMKTONE, KIOCSOUND) -Wants=modprobe@pcspkr.service -After=modprobe@pcspkr.service - -[Service] -User=beep -Type=oneshot -ExecStart=/usr/local/bin/pacman-beep.sh - -[Install] -WantedBy=sound.target diff --git a/configs/releng/airootfs/etc/systemd/system/sound.target.wants/pacmanbeeper.service b/configs/releng/airootfs/etc/systemd/system/sound.target.wants/pacmanbeeper.service deleted file mode 120000 index fc5ade0..0000000 --- a/configs/releng/airootfs/etc/systemd/system/sound.target.wants/pacmanbeeper.service +++ /dev/null @@ -1 +0,0 @@ -../pacmanbeeper.service \ No newline at end of file diff --git a/configs/releng/airootfs/etc/sysusers.d/beep.conf b/configs/releng/airootfs/etc/sysusers.d/beep.conf deleted file mode 100644 index c7d10ca..0000000 --- a/configs/releng/airootfs/etc/sysusers.d/beep.conf +++ /dev/null @@ -1,2 +0,0 @@ -#Type Name ID GECOS Home directory Shell -u beep - beepuser - - diff --git a/configs/releng/airootfs/etc/udev/rules.d/90-pcspkr-beep.rules b/configs/releng/airootfs/etc/udev/rules.d/90-pcspkr-beep.rules deleted file mode 100644 index 12a3a61..0000000 --- a/configs/releng/airootfs/etc/udev/rules.d/90-pcspkr-beep.rules +++ /dev/null @@ -1,2 +0,0 @@ -# Add write access to the PC speaker for the "beep" group -ACTION=="add", SUBSYSTEM=="input", ATTRS{name}=="PC Speaker", ENV{DEVNAME}!="", RUN+="/usr/bin/setfacl -m u:beep:w '$env{DEVNAME}'" diff --git a/configs/releng/airootfs/usr/local/bin/pacman-beep.sh b/configs/releng/airootfs/usr/local/bin/pacman-beep.sh deleted file mode 100755 index 8bc1199..0000000 --- a/configs/releng/airootfs/usr/local/bin/pacman-beep.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# I think I converted this from a wav using https://github.com/tomas-teijeiro/wavtobeep -beep -l 100 -f 15804.2656402 -n -l 25 -f 19.4454364826 -n -l 25 -f 123.470825314 -n -l 50 -f 554.365261954 -n -l 75 -f 138.591315488 -n -l 75 -f 1108.73052391 -n -l 50 -f 19.4454364826 -n -l 75 -f 783.990871963 -n -l 50 -f 19.4454364826 -n -l 75 -f 698.456462866 -n -l 50 -f 195.997717991 -n -l 25 -f 184.997211356 -n -l 50 -f 1108.73052391 -n -l 75 -f 783.990871963 -n -l 100 -f 138.591315488 -n -l 25 -f 155.563491861 -n -l 150 -f 698.456462866 -n -l 125 -f 195.997717991 -n -l 50 -f 554.365261954 -n -l 25 -f 587.329535835 -n -l 50 -f 138.591315488 -n -l 75 -f 1108.73052391 -n -l 50 -f 19.4454364826 -n -l 75 -f 880.0 -n -l 25 -f 38.8908729653 -n -l 25 -f 19.4454364826 -n -l 75 -f 739.988845423 -n -l 75 -f 220.0 -n -l 75 -f 1108.73052391 -n -l 50 -f 880.0 -n -l 25 -f 19.4454364826 -n -l 75 -f 138.591315488 -n -l 25 -f 123.470825314 -n -l 150 -f 739.988845423 -n -l 125 -f 220.0 -n -l 75 -f 554.365261954 -n -l 50 -f 138.591315488 -n -l 75 -f 1108.73052391 -n -l 25 -f 1046.5022612 -n -l 25 -f 1108.73052391 -n -l 25 -f 19.4454364826 -n -l 50 -f 783.990871963 -n -l 25 -f 830.60939516 -n -l 25 -f 19.4454364826 -n -l 25 -f 622.253967444 -n -l 75 -f 698.456462866 -n -l 50 -f 195.997717991 -n -l 25 -f 155.563491861 -n -l 50 -f 1108.73052391 -n -l 75 -f 783.990871963 -n -l 100 -f 138.591315488 -n -l 25 -f 19.4454364826 -n -l 125 -f 698.456462866 -n -l 150 -f 195.997717991 -n -l 50 -f 622.253967444 -n -l 75 -f 698.456462866 -n -l 75 -f 739.988845423 -n -l 25 -f 19.4454364826 -n -l 25 -f 38.8908729653 -n -l 125 -f 739.988845423 -n -l 100 -f 783.990871963 -n -l 25 -f 19.4454364826 -n -l 75 -f 783.990871963 -n -l 150 -f 880.0 -n -l 50 -f 19.4454364826 -n -l 125 -f 1108.73052391 -n -l 75 -f 261.625565301 -n -l 25 -f 277.182630977 -n -l 25 -f 261.625565301 diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 0b3fe04..aaf2416 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -4,7 +4,6 @@ arch-install-scripts archinstall b43-fwcutter base -beep bind-tools brltty broadcom-wl diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh index e8cb892..5feb205 100644 --- a/configs/releng/profiledef.sh +++ b/configs/releng/profiledef.sh @@ -20,5 +20,4 @@ file_permissions=( ["/usr/local/bin/choose-mirror"]="0:0:755" ["/usr/local/bin/Installation_guide"]="0:0:755" ["/usr/local/bin/livecd-sound"]="0:0:755" - ["/usr/local/bin/pacman-beep.sh"]="0:0:755" ) -- cgit v1.2.3-70-g09d2 From 09b0428128700f37bd465eb54c6e45f69c17617d Mon Sep 17 00:00:00 2001 From: nl6720 Date: Fri, 1 Apr 2022 18:04:23 +0300 Subject: configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount: use ramfs When using tmpfs, it is possible that parts of it end up getting put in swap space (only if there is one). This may not be desired, so use ramfs instead. --- CHANGELOG.rst | 2 ++ configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'configs/releng/airootfs/etc/systemd/system') diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6930291..c26bc21 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,6 +11,8 @@ Added Changed ------- +- Mount /etc/pacman.d/gnupg on ramfs instead of tmpfs to ensure its contents never land in swap. + Removed ------- 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..0ba0e67 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 @@ -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 -- cgit v1.2.3-70-g09d2 From 8c837ca23b4dd3267ee6cc570cf05b17a570a8d1 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Thu, 28 Apr 2022 14:47:14 +0300 Subject: configs/*: add VMware and Hyper-V guest packages and enable their services * open-vm-tools package, vmtoolsd.service and vmware-vmblock-fuse.service for VMware. * hyperv package, hv_fcopy_daemon.service, hv_kvp_daemon.service and hv_vss_daemon.service for Hyper-V. Related to #118. --- CHANGELOG.rst | 2 ++ .../etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service | 1 + .../etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service | 1 + .../etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service | 1 + .../etc/systemd/system/multi-user.target.wants/vmtoolsd.service | 1 + .../systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service | 1 + configs/baseline/packages.x86_64 | 2 ++ .../etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service | 1 + .../etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service | 1 + .../etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service | 1 + .../etc/systemd/system/multi-user.target.wants/vmtoolsd.service | 1 + .../systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service | 1 + configs/releng/packages.x86_64 | 2 ++ 13 files changed, 16 insertions(+) create mode 120000 configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service create mode 120000 configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service create mode 120000 configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service create mode 120000 configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service create mode 120000 configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service create mode 120000 configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service create mode 120000 configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service create mode 120000 configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service create mode 120000 configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service create mode 120000 configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service (limited to 'configs/releng/airootfs/etc/systemd/system') diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f706175..77ce992 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,6 +10,8 @@ Added - Add dmidecode to the list of packages in the releng profile. - Add open-iscsi to the list of packages in the releng profile to allow installing Arch on an iSCSI target. +- Add open-vm-tools and hyperv to the list of packages and enable their services to provide better integration with the + VMware and Hyper-V hypervisors. Changed ------- diff --git a/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service new file mode 120000 index 0000000..20ac7b2 --- /dev/null +++ b/configs/baseline/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/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service new file mode 120000 index 0000000..a7eac4a --- /dev/null +++ b/configs/baseline/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/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service new file mode 120000 index 0000000..eae19ef --- /dev/null +++ b/configs/baseline/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/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service new file mode 120000 index 0000000..e0a11a7 --- /dev/null +++ b/configs/baseline/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/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service new file mode 120000 index 0000000..173f306 --- /dev/null +++ b/configs/baseline/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/configs/baseline/packages.x86_64 b/configs/baseline/packages.x86_64 index 0a64120..cbb93b0 100644 --- a/configs/baseline/packages.x86_64 +++ b/configs/baseline/packages.x86_64 @@ -1,8 +1,10 @@ base cloud-init +hyperv linux mkinitcpio mkinitcpio-archiso +open-vm-tools openssh pv qemu-guest-agent diff --git a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service new file mode 120000 index 0000000..20ac7b2 --- /dev/null +++ b/configs/releng/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/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service new file mode 120000 index 0000000..a7eac4a --- /dev/null +++ b/configs/releng/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/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service new file mode 120000 index 0000000..eae19ef --- /dev/null +++ b/configs/releng/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/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service new file mode 120000 index 0000000..e0a11a7 --- /dev/null +++ b/configs/releng/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/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service new file mode 120000 index 0000000..173f306 --- /dev/null +++ b/configs/releng/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/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index aad3a18..511f452 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -36,6 +36,7 @@ gptfdisk grml-zsh-config grub hdparm +hyperv intel-ucode ipw2100-fw ipw2200-fw @@ -75,6 +76,7 @@ nmap ntfs-3g nvme-cli open-iscsi +open-vm-tools openconnect openssh openvpn -- cgit v1.2.3-70-g09d2