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.

7 files changed, 0 insertions, 23 deletions

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"
 )