SOURCES: alsasound.init - use modprobe -c to get modprobe config (...

[glen]

Author: glen                         Date: Mon Oct  1 16:39:00 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use modprobe -c to get modprobe config (so alsaconf generated /etc/modprobe.d/sound could be used)

---- Files affected:
SOURCES:
   alsasound.init (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SOURCES/alsasound.init
diff -u SOURCES/alsasound.init:1.16 SOURCES/alsasound.init:1.17
--- SOURCES/alsasound.init:1.16	Wed Jun 13 18:32:43 2007
+++ SOURCES/alsasound.init	Mon Oct  1 18:38:55 2007
@@ -30,14 +30,6 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-if [ $(kernelverser) = "002006" ]; then
-	MODULES_CONF=/etc/modprobe.conf
-elif [ -r /etc/modules.conf ]; then
-	MODULES_CONF=/etc/modules.conf
-else
-	MODULES_CONF=/etc/conf.modules
-fi
-
 driver_start()
 {
   #
@@ -46,14 +38,14 @@
   if OLDLOGLEV=$(awk '{print $1}' < /proc/sys/kernel/printk 2> /dev/null); then
   	/sbin/loglevel 1
   fi
-  awk '$1 == "alias" && $3 != "off" && ($2 ~ /^snd-card-[0-9]$/) {print $2}' < $MODULES_CONF | \
+  modprobe -c | awk '$1 == "alias" && $3 != "off" && ($2 ~ /^snd-card-[0-9]$/) {print $2}' | \
     while read line; do \
       msg_starting "sound driver: $line"
       busy
       /sbin/modprobe $line
       ok
     done
-  awk '$1 == "alias" && $3 != "off" && ($2 ~ /^sound-service-[0-9]-[0-9]+$/) {print $2}' < $MODULES_CONF | \
+  modprobe -c | awk '$1 == "alias" && $3 != "off" && ($2 ~ /^sound-service-[0-9]-[0-9]+$/) {print $2}' | \
     while read line; do \
       msg_starting "sound driver: $line"
       busy
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/alsasound.init?r1=1.16&r2=1.17&f=u