diff options
| author |   Steve Dibb <beandog@gentoo.org> | 2008-05-15 19:52:42 +0000 |
|---|---|---|
| committer | Steve Dibb <beandog@gentoo.org> | 2008-05-15 19:52:42 +0000 |
| commit | ac2801c03fcff31e1cbc3abad84c0662bcd8d10b (patch) | |
| tree | 635c6d7481efb3d2dad254305ca540a88cb5094f /media-sound/alsa-utils | |
| parent | amd64/x86 stable, bug #222133 (diff) | |
| download | gentoo-2-ac2801c03fcff31e1cbc3abad84c0662bcd8d10b.tar.gz gentoo-2-ac2801c03fcff31e1cbc3abad84c0662bcd8d10b.tar.bz2 gentoo-2-ac2801c03fcff31e1cbc3abad84c0662bcd8d10b.zip | |
Check for kernel version, bug 207371
(Portage version: 2.1.5)
Diffstat (limited to 'media-sound/alsa-utils')
| -rw-r--r-- | media-sound/alsa-utils/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/alsa-utils/files/alsasound.initd | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog index 44ccefc62983..928c90589f66 100644 --- a/media-sound/alsa-utils/ChangeLog +++ b/media-sound/alsa-utils/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/alsa-utils # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.236 2008/05/15 18:16:18 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.237 2008/05/15 19:52:42 beandog Exp $ + + 15 May 2008; Steve Dibb <beandog@gentoo.org> files/alsasound.initd: + Check for kernel version, bug 207371 15 May 2008; Steve Dibb <beandog@gentoo.org> files/alsasound.confd, files/alsasound.initd: diff --git a/media-sound/alsa-utils/files/alsasound.initd b/media-sound/alsa-utils/files/alsasound.initd index e3eb3c94880b..dd376d19b68d 100644 --- a/media-sound/alsa-utils/files/alsasound.initd +++ b/media-sound/alsa-utils/files/alsasound.initd @@ -1,5 +1,5 @@ #!/sbin/runscript -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.7 2008/05/15 18:16:18 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.8 2008/05/15 19:52:42 beandog Exp $ # Copyright 2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 @@ -221,9 +221,11 @@ stop() { fi if [ -f /proc/modules ] && [ "${UNLOAD_ON_STOP}" = "yes" ]; then - local ver="24" - rmmod --version | grep -q module-init-tools && ver="26" - + local ver="26" + case "$(uname -r)" in + 2.[01234].*) ver="24";; + *) ver="26";; + esac ebegin "Unloading ALSA modules" eindent unload_modules_${ver} |