summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-02-21 00:12:24 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-02-21 00:12:24 +0000
commitbcbcbb6a9ab8a91abfebee306ea5d12d9e8b8e78 (patch)
treeaf1bdf050b6abf3a86c9e212ca2508b954945e01 /media-sound/alsa-utils
parentheader fix; inherit eutils for epatch; arm needs deps first (Manifest recommit) (diff)
downloadgentoo-2-bcbcbb6a9ab8a91abfebee306ea5d12d9e8b8e78.tar.gz
gentoo-2-bcbcbb6a9ab8a91abfebee306ea5d12d9e8b8e78.tar.bz2
gentoo-2-bcbcbb6a9ab8a91abfebee306ea5d12d9e8b8e78.zip
alsasound init script has been updated to fix terminate (bug #35916) and 2.6 per-soundcard scripts (bug #42248).
Diffstat (limited to 'media-sound/alsa-utils')
-rw-r--r--media-sound/alsa-utils/ChangeLog6
-rw-r--r--media-sound/alsa-utils/files/alsasound5
2 files changed, 8 insertions, 3 deletions
diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index b97f6529b913..6f482b161f00 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/alsa-utils
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.44 2004/02/19 08:53:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.45 2004/02/21 00:12:22 eradicator Exp $
+
+ 20 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+ alsasound init script has been updated to fix terminate (bug #35916) and 2.6
+ per-soundcard scripts (bug #42248).
19 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
Updated alsasound initscript to fix 'loading unneccessary modules on 2.6
diff --git a/media-sound/alsa-utils/files/alsasound b/media-sound/alsa-utils/files/alsasound
index 68f04d2311c6..8941edd65238 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.10 2004/02/19 08:53:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.11 2004/02/21 00:12:24 eradicator Exp $
#
# Gentoo users: add this script to 'boot' run level.
# ==================================================
@@ -100,6 +100,7 @@ start() {
for DRIVER in ${DRIVERS}
do
TMP=${DRIVER##snd-}
+ TMP=${TMP##snd_}
[ -x "${alsascrdir}/${TMP}" ] && ${alsascrdir}/${TMP}
done
@@ -158,7 +159,7 @@ terminate() {
ossdevs="/dev/admmidi? /dev/adsp? /dev/amidi? /dev/audio* /dev/dmfm* \
/dev/dmmidi? /dev/dsp* /dev/dspW* /dev/midi0? /dev/mixer? /dev/music \
/dev/patmgr? /dev/sequencer* /dev/sndstat"
- alsadevs="/proc/asound/dev/*"
+ alsadevs="/proc/asound/dev/* /dev/sound/* /dev/snd/*"
fuser -k $ossdevs $alsadevs 2> /dev/null 1>/dev/null
#