[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian (alsa-base.init changelog)

[Thomas Hood]

    Date: Friday, September 10, 2004 @ 09:32:00
  Author: jdthood-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian

Modified: alsa-base.init changelog

Do attempt to alsactl restore in initscript start


----------------+
 alsa-base.init |   10 +++-------
 changelog      |    8 +++-----
 2 files changed, 6 insertions(+), 12 deletions(-)


Index: debian/alsa-driver/debian/alsa-base.init
diff -u debian/alsa-driver/debian/alsa-base.init:1.56 debian/alsa-driver/debian/alsa-base.init:1.57
--- debian/alsa-driver/debian/alsa-base.init:1.56	Thu Sep  9 07:44:44 2004
+++ debian/alsa-driver/debian/alsa-base.init	Fri Sep 10 09:31:59 2004
@@ -19,23 +19,19 @@
 
 [ -f /etc/default/alsa ] && . /etc/default/alsa
 
-# ALSA mixer settings should be restored via the module loader.
+# ALSA mixer settings should also be restored via the module loader.
 # Linux 2.4: /etc/modutils/alsa-base should contain:
 #   post-install CARDDRIVER /usr/sbin/alsactl restore
 # Linux 2.6: /etc/modprobe.d/sound should contain:
 #   install CARDDRIVER /sbin/modprobe --ignore-install CARDDRIVER && /usr/sbin/alsactl restore
 # In either case 'CARDDRIVER' should be replaced by the name of the card driver
-#
-# If you prefer to restore mixer settings from the initscript, call the
-# restore_mixer_settings function from the start method.
 
 restore_mixer_settings()
 {
 	if msg="$(alsactl restore 2>&1)"; then
 		return 0
 	else
-		echo
-		echo "${0}: Error running alsactl: $msg"
+		echo "${0}: Error: alsactl restore failed with message '$msg'." >&2
 		return 1
 	fi
 }
@@ -62,7 +58,7 @@
 start()
 {
 	printf "Starting ALSA..."
-	#restore_mixer_settings || return 1
+	restore_mixer_settings || :
 	echo "done."
 	return 0
 }
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.275 debian/alsa-driver/debian/changelog:1.276
--- debian/alsa-driver/debian/changelog:1.275	Wed Sep  8 07:57:23 2004
+++ debian/alsa-driver/debian/changelog	Fri Sep 10 09:31:59 2004
@@ -42,15 +42,13 @@
       + On restart, attempt start even if stop fails
       + On force-reload, start after force-stop
       + Don't pad '...' with spaces (as per policy 9.4)
-      + On start, don't attempt to restore mixer levels.  In order to
-        avoid lost races this should be done by the module loader
-        (see #268221).  Add a nice comment to explain this.
-        (Closes: #270419)
+      + On start, don't fail if attempt to restore mixer levels fails.
+        In order to avoid lost races this should be done by the module
+        loader (see #268221).  (Closes: #270419)
     - /etc/default/alsa
       + Try to improve comments some more
     - /etc/apm/event.d/alsa
       + Rewrite
-      + Add esdctl commands if esdctl is present
       + Remove redundant fuser commands.  Calling the initscript with
         "force-stop" should do everything that is required.
         (Closes: #269282)