From 2768fbb02562441e48a4cccbe2dba460fbde753d Mon Sep 17 00:00:00 2001 From: David P Date: Sun, 29 May 2022 20:23:59 -0400 Subject: sync with archiso v62.1 Signed-off-by: David P --- CHANGELOG.rst | 8 ++++++++ .../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.both | 2 -- configs/releng/profiledef.sh | 2 -- 8 files changed, 8 insertions(+), 25 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 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a17275a..dbb3250 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,14 @@ Changed Removed ------- +[62.1] - 2022-04-05 +=================== + +Removed +------- + +- Easter egg + [62] - 2022-03-31 ================= 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.both b/configs/releng/packages.both index dae7bd8..1719ec5 100644 --- a/configs/releng/packages.both +++ b/configs/releng/packages.both @@ -1,12 +1,10 @@ alsa-utils arch-install-scripts base -beep bind-tools brltty btrfs-progs cloud-init -crda cryptsetup darkhttpd ddrescue diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh index 6aa4deb..8ca837f 100644 --- a/configs/releng/profiledef.sh +++ b/configs/releng/profiledef.sh @@ -20,6 +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.2