diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-02-09 12:01:37 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-02-09 12:01:37 +0000 |
| commit | d396e81c1bd1af9539f4da3ba22fb0595bbf896b (patch) | |
| tree | 195bd44796ece6120fa49390ff314460a4f2043b /media-sound/alsa-utils/files | |
| parent | Adding amd64 keyword (diff) | |
| download | historical-d396e81c1bd1af9539f4da3ba22fb0595bbf896b.tar.gz historical-d396e81c1bd1af9539f4da3ba22fb0595bbf896b.tar.bz2 historical-d396e81c1bd1af9539f4da3ba22fb0595bbf896b.zip | |
Updated alsasound init script to not load sequencer modules that are compiled into the kernel. Fixes bug #37786.
Diffstat (limited to 'media-sound/alsa-utils/files')
| -rw-r--r-- | media-sound/alsa-utils/files/alsasound | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/media-sound/alsa-utils/files/alsasound b/media-sound/alsa-utils/files/alsasound index 5522d88dc691..afe25219d5c3 100644 --- a/media-sound/alsa-utils/files/alsasound +++ b/media-sound/alsa-utils/files/alsasound @@ -1,5 +1,5 @@ #!/sbin/runscript -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.7 2004/02/07 05:00:03 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.8 2004/02/09 12:01:37 eradicator Exp $ # # Gentoo users: add this script to 'boot' run level. # ================================================== @@ -74,7 +74,8 @@ start() { for DRIVER in ${DRIVERS} do if [ ! "${DRIVER}" = off ] && - [ -z `cut -d' ' -f1 /proc/modules | egrep "^${DRIVER}\$"` ]; then + [ -z `cut -d' ' -f1 /proc/modules | egrep "^${DRIVER}\$"` ] && + [ -z `cut -d' ' -f1 /proc/modules | egrep "^${DRIVER/-/_}\$"` ]; then einfo "Loading: ${DRIVER}" /sbin/modprobe ${DRIVER} fi @@ -83,10 +84,11 @@ start() { sleep 1 if [ -f /proc/asound/seq/drivers ] ; then - SEQUENCERS="$(cut -d"," -f1 /proc/asound/seq/drivers)" + SEQUENCERS="$(awk -F, '$2~/^empty$/ {print $1}' /proc/asound/seq/drivers)" for SEQUENCER in ${SEQUENCERS} do - if [ -z `cut -d' ' -f1 /proc/modules | egrep "^${SEQUENCER}\$"` ]; then + if [ -z `cut -d' ' -f1 /proc/modules | egrep "^${SEQUENCER}\$"` ] && + [ -z `cut -d' ' -f1 /proc/modules | egrep "^${SEQUENCER/-/_}\$"` ]; then einfo "Loading: ${SEQUENCER}" [ -n "${SEQUENCER}" ] && /sbin/modprobe ${SEQUENCER} fi |