Release new version 0.9.24.

[grml-autoconfig.git] / autoconfig.functions

diff --git a/autoconfig.functions b/autoconfig.functions
index 882d3f4..dec5107 100755 (executable)
--- 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
       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 \"$(awk -F\[ '/^ *'$card' \[/{ FS=" "; $0=$2; print $1}' < /proc/asound/cards)\""

          eindent
 
          if checkbootparam 'vol' ; then
          eindent
 
          if checkbootparam 'vol' ; then


@@ -1533,7 +1533,7 @@ config_mixer () {
             fi
 
             for CONTROL in Master PCM ; do
             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
                   amixer -q set "${CONTROL}" "${VOL}"%
                   eend $?
                fi


@@ -2375,7 +2375,7 @@ config_tohd()
 # {{{ grml2hd: automatic installation
 config_grml2hd(){
 
 # {{{ grml2hd: automatic installation
 config_grml2hd(){
 

-if checkbootparam "BOOT_IMAGE=grml2hd" ; then
+if checkbootparam "grml2hd" || checkbootparam "BOOT_IMAGE=grml2hd" ; then

 
 if checkbootparam 'user' ; then
    NEWUSER=''
 
 if checkbootparam 'user' ; then
    NEWUSER=''