diff options
author | Steve Dibb <beandog@gentoo.org> | 2008-05-15 20:17:46 +0000 |
---|---|---|
committer | Steve Dibb <beandog@gentoo.org> | 2008-05-15 20:17:46 +0000 |
commit | 992205d3132101341d6ed015abdf1b0ac689d519 (patch) | |
tree | b600eeadee00a385ae4d2945cbc38e8c5486c6d3 /media-sound | |
parent | Keyworded on alpha, the cciss bug is fixed. (diff) | |
download | gentoo-2-992205d3132101341d6ed015abdf1b0ac689d519.tar.gz gentoo-2-992205d3132101341d6ed015abdf1b0ac689d519.tar.bz2 gentoo-2-992205d3132101341d6ed015abdf1b0ac689d519.zip |
Don't restore soundlevels unless ALSA properly initializes, bug 196908
(Portage version: 2.1.5)
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/alsa-utils/ChangeLog | 5 | ||||
-rw-r--r-- | media-sound/alsa-utils/files/alsasound.initd | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog index 928c90589f66..731d87fab4e3 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.237 2008/05/15 19:52:42 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.238 2008/05/15 20:17:46 beandog Exp $ + + 15 May 2008; Steve Dibb <beandog@gentoo.org> files/alsasound.initd: + Don't restore soundlevels unless ALSA properly initializes, bug 196908 15 May 2008; Steve Dibb <beandog@gentoo.org> files/alsasound.initd: Check for kernel version, bug 207371 diff --git a/media-sound/alsa-utils/files/alsasound.initd b/media-sound/alsa-utils/files/alsasound.initd index dd376d19b68d..40600cf71570 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.8 2008/05/15 19:52:42 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.9 2008/05/15 20:17:46 beandog Exp $ # Copyright 2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 @@ -199,10 +199,10 @@ start() { eerror "ALSA failed to load." eend 1 return 1 + elif [ "${RESTORE_ON_START}" = "yes" ]; then + restore fi - [ "${RESTORE_ON_START}" = "yes" ] && restore - return 0 } |