Update of /cvsroot/alsa/alsa-utils/alsaconf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27688
Modified Files:
alsaconf.in
Log Message:
fixed the legacy detection with the recent modprobe
Index: alsaconf.in
===================================================================
RCS file: /cvsroot/alsa/alsa-utils/alsaconf/alsaconf.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- alsaconf.in 5 Mar 2004 16:52:11 -0000 1.14
+++ alsaconf.in 19 Mar 2004 13:29:23 -0000 1.15
@@ -723,7 +723,12 @@
ac_try_load () {
test $do_logging = 1 && echo "$1 ${*:2}" >> $LOGFILE
/sbin/modprobe snd-$1 ${*:2} >/dev/null 2>&1
- $lsmod | grep -E '(snd-|snd_)'$1 >/dev/null 2>&1 || return 1
+ if $lsmod | grep -E '^(snd-|snd_)'$1' ' >/dev/null 2>&1; then
+ : ;
+ else
+ modprobe -r snd-$1 >/dev/null 2>&1
+ return 1
+ fi
# mute mixers
amixer set Master 0% mute >/dev/null 2>&1
@@ -757,7 +762,12 @@
ac_try_capture () {
test $do_logging = 1 && echo "$1 ${*:2}" >> $LOGFILE
/sbin/modprobe snd-$1 ${*:3} >/dev/null 2>&1
- $lsmod | grep -E '(snd-|snd_)'$1 >/dev/null 2>&1 || return 1
+ if $lsmod | grep -E '^(snd-|snd_)'$1' ' >/dev/null 2>&1; then
+ : ;
+ else
+ modprobe -r snd-$1 >/dev/null 2>&1
+ return 1
+ fi
# mute mixers
amixer set Master 0% mute >/dev/null 2>&1
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
