diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-06-18 08:07:53 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-06-18 08:07:53 +0000 |
| commit | bd143cac9745ee3a8d0f72f05018f821409470cc (patch) | |
| tree | 5bb62a8b96e8189ffcf4573514b04eb1cb7c8a96 /media-sound/alsa-utils | |
| parent | Fixes #53657. (Manifest recommit) (diff) | |
| download | gentoo-2-bd143cac9745ee3a8d0f72f05018f821409470cc.tar.gz gentoo-2-bd143cac9745ee3a8d0f72f05018f821409470cc.tar.bz2 gentoo-2-bd143cac9745ee3a8d0f72f05018f821409470cc.zip | |
Fix return value for success of modules_unload. Redirect stdout and stderr for rmmod. Closes bug #54274.
Diffstat (limited to 'media-sound/alsa-utils')
| -rw-r--r-- | media-sound/alsa-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/alsa-utils/files/alsasound | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog index f4511e8f6297..e18e035209e5 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.56 2004/06/08 02:34:45 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.57 2004/06/18 08:07:53 eradicator Exp $ + + 18 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound: + Fix return value for success of modules_unload. Redirect stdout and + stderr for rmmod. Closes bug #54274. 07 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound: Small beautification changes to init script. diff --git a/media-sound/alsa-utils/files/alsasound b/media-sound/alsa-utils/files/alsasound index 22b80ef69062..449deee8bfa4 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.13 2004/06/08 02:34:45 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.14 2004/06/18 08:07:53 eradicator Exp $ # # Gentoo users: add this script to 'boot' run level. # ================================================== @@ -110,10 +110,13 @@ unload_modules() { LOADED_MODULES="$(/sbin/lsmod | grep -E "^snd" | awk '{print $1}')" for MODULE in ${LOADED_MODULES} do - /sbin/rmmod ${MODULE} 2> /dev/null + /sbin/rmmod ${MODULE} >& /dev/null done - /sbin/rmmod soundcore 2> /dev/null - /sbin/rmmod gameport 2> /dev/null + /sbin/rmmod soundcore >& /dev/null + /sbin/rmmod gameport >& /dev/null + + # Return success if the modules are unloaded + test -z "$(/sbin/lsmod | grep -E "^snd" | awk '{print $1}')" } terminate() { |