From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 0c051ce27903e9d18c8ee247d92535c633ef93a2
Date: Mon, 04 Mar 2024 14:23:42 +0000
Message-ID: <4TpLXZ509zz2xP9@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2675912820443638503=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============2675912820443638503==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

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, next has been updated
       via  0c051ce27903e9d18c8ee247d92535c633ef93a2 (commit)
      from  6dac44d40c4e1e80c497959f7098158462b033cb (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 0c051ce27903e9d18c8ee247d92535c633ef93a2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Mar 4 15:22:52 2024 +0100

    alsa: Don't fail on upgrading the package
    
    If alsa has not been started on a system the upgrade script fails with
    exit code 1 and prevents Pakfire from completing the update.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 src/paks/alsa/update.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/src/paks/alsa/update.sh b/src/paks/alsa/update.sh
index 14cf836b2d..6ea2cdbb25 100644
--- a/src/paks/alsa/update.sh
+++ b/src/paks/alsa/update.sh
@@ -22,8 +22,19 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
-mv /etc/asound.state /tmp
+
+# Backup /etc/asound.state
+if [ -e "/etc/asound.state" ]; then
+	mv /etc/asound.state /tmp/asound.state
+fi
+
 extract_backup_includes
 ./uninstall.sh
 ./install.sh
-mv /tmp/asound.state /etc
+
+# Restore asound.state
+if [ -e "/tmp/asound.state" ]; then
+	mv /tmp/asound.state /etc/asound.state
+fi
+
+exit 0


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

--===============2675912820443638503==--