diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-02-19 08:53:01 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-02-19 08:53:01 +0000 |
| commit | 93e7b0242ec07ead7651c8ce187473e35e3ee229 (patch) | |
| tree | f9d20847a23a87dbca12f81b522e3e3f142ce4d4 /media-sound | |
| parent | cd to ${S} in unpack so the patch works (diff) | |
| download | historical-93e7b0242ec07ead7651c8ce187473e35e3ee229.tar.gz historical-93e7b0242ec07ead7651c8ce187473e35e3ee229.tar.bz2 historical-93e7b0242ec07ead7651c8ce187473e35e3ee229.zip | |
Updated alsasound initscript to fix 'loading unneccessary modules on 2.6 kernels' bug #41600.
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/alsa-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/alsa-utils/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/alsa-utils/files/alsasound | 37 |
3 files changed, 25 insertions, 22 deletions
diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog index 6b26d876b5ed..b97f6529b913 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.43 2004/02/12 12:20:01 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.44 2004/02/19 08:53:01 eradicator Exp $ + + 19 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound: + Updated alsasound initscript to fix 'loading unneccessary modules on 2.6 + kernels' bug #41600. 12 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> alsa-utils-0.9.8.ebuild, alsa-utils-1.0.0_rc2.ebuild, diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest index 5a2b0ab6623f..da26c7e12884 100644 --- a/media-sound/alsa-utils/Manifest +++ b/media-sound/alsa-utils/Manifest @@ -5,7 +5,7 @@ MD5 cb7c28bed532832f9fd55119f73b8f6d alsa-utils-1.0.0_rc2.ebuild 1952 MD5 7528fe3c03ea6f922009aaa0f21e628c alsa-utils-0.9.8.ebuild 1850 MD5 b268f1eb52b27b8146ddf58e76c55d4f alsa-utils-0.5.10-r8.ebuild 970 MD5 e6680e624126367a971065c1507240c6 alsa-utils-0.9.5.ebuild 899 -MD5 50020f3aa1b5e8894d62224a0ef16e7c ChangeLog 7322 +MD5 0c6e9601cdfbf3ac480f97d290164de0 ChangeLog 7495 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 MD5 2f04e1511bffe93b3e4b6a4eaebda90c alsa-utils-1.0.2.ebuild 1943 MD5 f8aff370f9c369682ac793f5b3f4886e files/alsa-modules.conf-rc 1158 @@ -19,4 +19,4 @@ MD5 ad803523008747726c87b9c505517f4c files/digest-alsa-utils-1.0.0_rc2 72 MD5 f20045fc395596290d5a6d807ba311fc files/alsa-utils-0.5.10-aplay-destdir.diff 626 MD5 dcc66ee6a9db24006a4158e2be0da3f2 files/alsa-0.5.10 392 MD5 a82c4c173c1d617bae9967438c659bac files/digest-alsa-utils-0.5.10-r8 70 -MD5 ac9fe7947f1089b96126675abaf5a040 files/alsasound 5263 +MD5 25c20f1265a6b5c5eeb6b887fe9e3969 files/alsasound 5272 diff --git a/media-sound/alsa-utils/files/alsasound b/media-sound/alsa-utils/files/alsasound index 6816054f933f..68f04d2311c6 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.9 2004/02/12 12:20:01 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.10 2004/02/19 08:53:01 eradicator Exp $ # # Gentoo users: add this script to 'boot' run level. # ================================================== @@ -49,28 +49,27 @@ start() { else ebegin "Loading ALSA drivers" - # I really dislike this and would like to tidy it up. - # Anyone running 2.4 + alsa-driver willing to help me? - - DRIVERS="$(modprobe -c | grep snd.* | grep pci: | awk '{ print $3 }' | uniq)" - if [ -z "${DRIVERS}" ] ; then - # Fallback on older modprobe syntax - DRIVERS="$(/sbin/modprobe -c | grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | awk '{print $3}')" - fi - - [ -z "${DRIVERS}" ] && eerror "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?" - # Test for use of OSS + DRIVERS="$(modprobe -c | grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | awk '{print $3}')" if modprobe -c | grep -q "snd.*oss$" ; then - einfo "Using ALSA OSS emulation" - OSS="$(modprobe -l | grep "snd.*oss" | sed -e "s:\/.*\/::" -e "s:\..*::")" - # Add oss modules to list - for i in ${OSS} - do - DRIVERS="${i} ${DRIVERS}" - done + # Test for use of OSS + einfo "Using ALSA OSS emulation" + OSS="$(modprobe -l | grep "snd.*oss" | sed -e "s:\/.*\/::" -e "s:\..*::")" + # Add oss modules to list + for i in ${OSS} + do + DRIVERS="${i} ${DRIVERS}" + done fi + # Fall back on the automated aliases if we don't have ALSA configured properly... + if [ -z "${DRIVERS}" ]; then + ewarn "Could not detect custom ALSA settings. Loading all detected alsa drivers." + DRIVERS="$(modprobe -c | grep pci: | awk '{ print $3 }' | grep snd.* | sort | uniq)" + fi + + [ -z "${DRIVERS}" ] && eerror "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?" + for DRIVER in ${DRIVERS} do if [ ! "${DRIVER}" = off ] && |