From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v2 3/4] alsa: Fixes Bug#13087 - module removal & path
 correction for asound.state file
Date: Mon, 08 May 2023 19:07:22 +0200
Message-ID: <20230508170723.3525876-3-adolf.belka@ipfire.org>
In-Reply-To: <20230508170723.3525876-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7785421419226770002=="
List-Id: <development.lists.ipfire.org>

--===============7785421419226770002==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- start_service added to install.sh and stop_service to uninstall.sh
   This ensures that the modules are loaded after install
- The /etc/asound.state file was touched by the install.sh cript but the alsa=
ctl store and
   restore commands have default location of /var/lib/alsa/ so the touch comm=
and created
   an asound.state file that was then not used subsequently. It also meant th=
at the first
   start of alsa would fail as it would try and restore from /var/lib/alsa/as=
ound.state
   but the file did not exist.
- This patch corrects the path for the touch command for asound.state
- The install.sh script also checks if /etc/asound.state, that was never used=
, exists and
   if it does removes it.
- Uninstalling alsa left the sound modules installed until a reboot was carri=
ed out.
   Uninstallation should unload the alsa kernel modules.
   This patch adds the modprobe -r commands to the uninstall.sh file to unloa=
d all the snd
   modules when alsa is uninstalled.
- make_backup and restore_backup commands added to ther install.sh and uninst=
all.sh scripts

Fixes: Bug#13087
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 src/paks/alsa/install.sh   | 8 +++++++-
 src/paks/alsa/uninstall.sh | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/paks/alsa/install.sh b/src/paks/alsa/install.sh
index 7b6b3dc80..ee0092195 100644
--- a/src/paks/alsa/install.sh
+++ b/src/paks/alsa/install.sh
@@ -24,7 +24,13 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 groupadd audio 2>/dev/null
-touch /etc/asound.state
+touch /var/lib/alsa/asound.state
+if [ -f /etc/asound.state ]; then
+	rm /etc/asound.state
+fi
+restore_backup ${NAME}
 ln -svf  ../init.d/alsa /etc/rc.d/rc3.d/S65alsa
 ln -svf  ../init.d/alsa /etc/rc.d/rc0.d/K35alsa
 ln -svf  ../init.d/alsa /etc/rc.d/rc6.d/K35alsa
+start_service ${NAME}
+exit 0
diff --git a/src/paks/alsa/uninstall.sh b/src/paks/alsa/uninstall.sh
index 62e27008d..ce88c294b 100644
--- a/src/paks/alsa/uninstall.sh
+++ b/src/paks/alsa/uninstall.sh
@@ -22,5 +22,11 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+stop_service ${NAME}
+make_backup ${NAME}
+# unload alsa related modules
+modprobe -r snd_pcm_oss >/dev/null 2>&1 || failed=3D1
+modprobe -r snd_timer >/dev/null 2>&1 || failed=3D1
 remove_files
 rm -rf /etc/rc.d/rc*.d/*alsa
+exit 0
--=20
2.40.1


--===============7785421419226770002==--