Accepting request 65105 from home:WernerFink:branches:multimedia:libs

thanks

OBS-URL: https://build.opensuse.org/request/show/65105
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=72

alsa.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 24 11:27:27 UTC 2011 - werner@suse.de
+
+- Make boot script load modules on boot (bnc#682222)
+- Correct location of saved sound state in the boot script (bnc#682222)
+
 -------------------------------------------------------------------
 Mon Jan 31 17:14:35 CET 2011 - tiwai@suse.de
 

alsa.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package alsa (Version 1.0.24.1)
+# spec file for package alsa
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

alsasound

@@ -58,7 +58,7 @@
 rc_reset
 
 alsactl=/usr/sbin/alsactl
-asoundcfg=/etc/asound.state
+asoundcfg=/var/lib/asound.state
 aconnect=/usr/bin/aconnect
 
 #
@@ -78,7 +78,7 @@ load_sequencer() {
 
 get_drivers() {
   /sbin/modprobe -c | \
-    grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | sort | \
+    grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | sort -u | \
     while read a b card; do
 	echo $card
     done
@@ -188,8 +188,8 @@ stop_all() {
 # See how we were called.
 case "$1" in
   start)
-	if [ "$PREVLEVEL" = "N" ]; then
-	    test -d /proc/asound && start_rest
+	if test "$PREVLEVEL" = "N" -a -d /proc/asound ; then
+	    start_rest
 	else
 	    start_all
 	fi