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

[Thomas Hood]

    Date: Wednesday, September 8, 2004 @ 07:57:23
  Author: jdthood-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian

Modified: alsa-base.init changelog

Add comment to initscript about module loader configuration


----------------+
 alsa-base.init |   14 +++++++++++---
 changelog      |    7 ++++---
 2 files changed, 15 insertions(+), 6 deletions(-)


Index: debian/alsa-driver/debian/alsa-base.init
diff -u debian/alsa-driver/debian/alsa-base.init:1.53 debian/alsa-driver/debian/alsa-base.init:1.54
--- debian/alsa-driver/debian/alsa-base.init:1.53	Wed Sep  8 07:33:56 2004
+++ debian/alsa-driver/debian/alsa-base.init	Wed Sep  8 07:57:23 2004
@@ -19,10 +19,18 @@
 
 [ -f /etc/default/alsa ] && . /etc/default/alsa
 
+# ALSA mixer settings should 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()
 {
-	# ALSA mixer settings should really be restored via the module loader
-	sleep 5
 	if msg="$(alsactl restore 2>&1)"; then
 		return 0
 	else
@@ -35,7 +43,7 @@
 start()
 {
 	printf "Starting ALSA..."
-	restore_mixer_settings &
+	#restore_mixer_settings
 	echo "done."
 	return 0
 }
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.274 debian/alsa-driver/debian/changelog:1.275
--- debian/alsa-driver/debian/changelog:1.274	Wed Sep  8 07:33:56 2004
+++ debian/alsa-driver/debian/changelog	Wed Sep  8 07:57:23 2004
@@ -42,9 +42,10 @@
       + 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, attempt to restore mixer levels in the background.
-        In order to avoid lost races this should really be done by the
-        module loader (see #268221).  (Closes: #270419)
+      + 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)
     - /etc/default/alsa
       + Try to improve comments some more
     - /etc/apm/event.d/alsa