diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-02-07 05:00:10 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-02-07 05:00:10 +0000 |
| commit | 40485a54dda436831caf92b6c8fb8b31c95cbf61 (patch) | |
| tree | 3e20a88de5ffe6af84e97d9995b6dd191cc6d23f /media-sound | |
| parent | Version bump (bug #38914) (Manifest recommit) (diff) | |
| download | gentoo-2-40485a54dda436831caf92b6c8fb8b31c95cbf61.tar.gz gentoo-2-40485a54dda436831caf92b6c8fb8b31c95cbf61.tar.bz2 gentoo-2-40485a54dda436831caf92b6c8fb8b31c95cbf61.zip | |
init script now checks /proc/modules to see if module is loaded before modprobing. Closes bug #32045.
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/alsa-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/alsa-utils/Manifest | 22 | ||||
| -rw-r--r-- | media-sound/alsa-utils/files/alsasound | 13 |
3 files changed, 24 insertions, 17 deletions
diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog index c270ac98abd1..912ac242bc71 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.40 2004/01/27 19:35:04 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.41 2004/02/07 05:00:03 eradicator Exp $ + + 06 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound: + init script now checks /proc/modules to see if module is loaded before + modprobing. Closes bug #32045. *alsa-utils-1.0.2 (27 Jan 2004) diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest index 44049e58ba1d..db591f883d95 100644 --- a/media-sound/alsa-utils/Manifest +++ b/media-sound/alsa-utils/Manifest @@ -1,22 +1,22 @@ -MD5 2e773b8972cc002a761e56839f32204d ChangeLog 6372 -MD5 b268f1eb52b27b8146ddf58e76c55d4f alsa-utils-0.5.10-r8.ebuild 970 -MD5 0d1f89bc0713a7239243219ee57a1b7b alsa-utils-0.9.0_rc2.ebuild 921 MD5 140f4dd3c22323f5e9f671306f048d4d alsa-utils-0.9.2.ebuild 907 -MD5 e6680e624126367a971065c1507240c6 alsa-utils-0.9.5.ebuild 899 -MD5 85e4428528b2102ace3267899b9245df alsa-utils-0.9.8.ebuild 1851 +MD5 0d1f89bc0713a7239243219ee57a1b7b alsa-utils-0.9.0_rc2.ebuild 921 +MD5 6c070ab05ab65cdade3da66cabd578a1 alsa-utils-1.0.1.ebuild 1945 MD5 dcb320b60b86736993eccf725d0b93f7 alsa-utils-1.0.0_rc2.ebuild 1951 +MD5 85e4428528b2102ace3267899b9245df alsa-utils-0.9.8.ebuild 1851 +MD5 b268f1eb52b27b8146ddf58e76c55d4f alsa-utils-0.5.10-r8.ebuild 970 +MD5 e6680e624126367a971065c1507240c6 alsa-utils-0.9.5.ebuild 899 +MD5 27c97ce3e87415623b4abecea2563705 ChangeLog 6557 MD5 e1147a642867b3b3ea43518a1376f6d2 metadata.xml 250 -MD5 6c070ab05ab65cdade3da66cabd578a1 alsa-utils-1.0.1.ebuild 1945 MD5 fd6a240dd5c9f8937c44217ff4117e35 alsa-utils-1.0.2.ebuild 1940 -MD5 dcc66ee6a9db24006a4158e2be0da3f2 files/alsa-0.5.10 392 MD5 f8aff370f9c369682ac793f5b3f4886e files/alsa-modules.conf-rc 1158 -MD5 f20045fc395596290d5a6d807ba311fc files/alsa-utils-0.5.10-aplay-destdir.diff 626 -MD5 9b9f711aab8ee085e1f24c8d2cbebf74 files/alsasound 4803 -MD5 a82c4c173c1d617bae9967438c659bac files/digest-alsa-utils-0.5.10-r8 70 MD5 59a93bf64737644e4001cbb6ad5387b4 files/digest-alsa-utils-0.9.0_rc2 71 MD5 55414f65ffecf5f44fa35295dae8bf19 files/digest-alsa-utils-0.9.2 69 MD5 07ad906b0309f5e8061f7a6c99985532 files/digest-alsa-utils-0.9.5 69 MD5 c393c831cb8bcda375cd4690e85b3495 files/digest-alsa-utils-0.9.8 69 +MD5 e8a6136416d4dfb16cc6a313dab77aa1 files/digest-alsa-utils-1.0.1 69 MD5 937332cbdb9fab58e9e43a58a3f965de files/digest-alsa-utils-1.0.2 69 MD5 ad803523008747726c87b9c505517f4c files/digest-alsa-utils-1.0.0_rc2 72 -MD5 e8a6136416d4dfb16cc6a313dab77aa1 files/digest-alsa-utils-1.0.1 69 +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 ee470ceb0bfb1cd622d4c3c01b0b713e files/alsasound 4957 diff --git a/media-sound/alsa-utils/files/alsasound b/media-sound/alsa-utils/files/alsasound index 5cbcbc8d19ba..5522d88dc691 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.6 2003/12/18 22:29:56 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.7 2004/02/07 05:00:03 eradicator Exp $ # # Gentoo users: add this script to 'boot' run level. # ================================================== @@ -73,20 +73,23 @@ start() { for DRIVER in ${DRIVERS} do - if [ ! "${DRIVER}" = off ] ; then + if [ ! "${DRIVER}" = off ] && + [ -z `cut -d' ' -f1 /proc/modules | egrep "^${DRIVER}\$"` ]; then einfo "Loading: ${DRIVER}" /sbin/modprobe ${DRIVER} fi done sleep 1 - + if [ -f /proc/asound/seq/drivers ] ; then SEQUENCERS="$(cut -d"," -f1 /proc/asound/seq/drivers)" for SEQUENCER in ${SEQUENCERS} do - einfo "Loading: ${SEQUENCER}" - [ -n "${SEQUENCER}" ] && /sbin/modprobe ${SEQUENCER} + if [ -z `cut -d' ' -f1 /proc/modules | egrep "^${SEQUENCER}\$"` ]; then + einfo "Loading: ${SEQUENCER}" + [ -n "${SEQUENCER}" ] && /sbin/modprobe ${SEQUENCER} + fi done fi |