From: Christian Hofstaedtler <ch@grml.org>
Date: Tue, 28 Dec 2010 21:42:16 +0000 (+0100)
Subject: Fix sound volume init with multiple cards / duplicate control names
X-Git-Tag: v0.9.24~4
X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=f95a8d0413e8bd2aede866e66cbf0c0d421d8550

Fix sound volume init with multiple cards / duplicate control names
---

diff --git a/autoconfig.functions b/autoconfig.functions
index 882d3f4..23b4015 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1499,7 +1499,7 @@ config_mixer () {
       fi
 
       for card in $(cat /proc/asound/cards| grep -e '^\s*[0-9]' | awk '{print $1}') ; do
-         einfo "Configuring soundcard $(cat /proc/asound/cards| grep -e "$card" | awk -F\[ '{print $2}' | awk '{print $1}')"
+         einfo "Configuring soundcard \"$(cat /proc/asound/cards| awk -F\[ '/^ '$card'/{ FS=" "; $0=$2; print $1 }' )\""
          eindent
 
          if checkbootparam 'vol' ; then
@@ -1533,7 +1533,7 @@ config_mixer () {
             fi
 
             for CONTROL in Master PCM ; do
-               if amixer -q | grep -q "Simple mixer control.*$CONTROL" ; then
+               if amixer -q | grep -q "Simple mixer control '$CONTROL'" ; then
                   amixer -q set "${CONTROL}" "${VOL}"%
                   eend $?
                fi