This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via d3b2b04672209aa5971e69d99c4fa64da875a370 (commit) via 6c85ffbfd45a3c2f23e6b8f512c40cf9b0678d86 (commit) via cb58d049e0e121466fb2eb0694fa7b8e715b6f2c (commit) from 8064dce996a356e228be5fdd900a6733df3f47b7 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit d3b2b04672209aa5971e69d99c4fa64da875a370 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Dec 19 11:45:26 2023 +0100

alsa: bump package version

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 6c85ffbfd45a3c2f23e6b8f512c40cf9b0678d86 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Dec 19 11:44:03 2023 +0100

alsa: remove kernel module unload at uninstall

this sometimes result in unstable/crashing kernel.

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit cb58d049e0e121466fb2eb0694fa7b8e715b6f2c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Dec 19 11:35:53 2023 +0100

alsa: don't report failed module loads

this will stop pakfire if the kernel was updated before the alsa update.

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

-----------------------------------------------------------------------

Summary of changes: lfs/alsa | 2 +- src/initscripts/packages/alsa | 8 ++++---- src/paks/alsa/uninstall.sh | 3 --- 3 files changed, 5 insertions(+), 8 deletions(-)

Difference in files: diff --git a/lfs/alsa b/lfs/alsa index a2b34f83e..55b4f7152 100644 --- a/lfs/alsa +++ b/lfs/alsa @@ -38,7 +38,7 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) PROG = alsa -PAK_VER = 19 +PAK_VER = 20

DEPS =

diff --git a/src/initscripts/packages/alsa b/src/initscripts/packages/alsa index 348e33846..8c0a2cbd2 100644 --- a/src/initscripts/packages/alsa +++ b/src/initscripts/packages/alsa @@ -24,12 +24,12 @@

case "$1" in start) + modprobe snd_pcm_oss >/dev/null 2>&1 + modprobe snd_mixer_oss >/dev/null 2>&1 boot_mesg "Starting ALSA... Restoring volumes..." - modprobe snd_pcm_oss >/dev/null 2>&1 || failed=1 - modprobe snd_mixer_oss >/dev/null 2>&1 || failed=1 - (exit ${failed}) - evaluate_retval loadproc /usr/sbin/alsactl restore + evaluate_retval + exit 0 ;; stop) boot_mesg "Stopping ALSA... Saving volumes..." diff --git a/src/paks/alsa/uninstall.sh b/src/paks/alsa/uninstall.sh index ce88c294b..a02e2bbf9 100644 --- a/src/paks/alsa/uninstall.sh +++ b/src/paks/alsa/uninstall.sh @@ -24,9 +24,6 @@ . /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=1 -modprobe -r snd_timer >/dev/null 2>&1 || failed=1 remove_files rm -rf /etc/rc.d/rc*.d/*alsa exit 0

hooks/post-receive -- IPFire 2.x development tree