summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-01-31 21:44:54 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-01-31 21:44:54 +0000
commit34acc3f496619beff860bcd5e7bcc46eccc974ca (patch)
treea3dab9145038093d313ad721c381c847a69d2c3b /media-sound
parentLatest version with updates (diff)
downloadgentoo-2-34acc3f496619beff860bcd5e7bcc46eccc974ca.tar.gz
gentoo-2-34acc3f496619beff860bcd5e7bcc46eccc974ca.tar.bz2
gentoo-2-34acc3f496619beff860bcd5e7bcc46eccc974ca.zip
Don't return an error if there is no asound.state file. Closes bug #80196.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/alsa-utils/ChangeLog5
-rw-r--r--media-sound/alsa-utils/files/alsasound3
2 files changed, 5 insertions, 3 deletions
diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index c7aa05fedaae..044f8ffba36f 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-sound/alsa-utils
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.84 2005/01/23 18:53:12 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.85 2005/01/31 21:44:54 eradicator Exp $
+
+ 31 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+ Don't return an error if there is no asound.state file. Closes bug #80196.
23 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> alsa-utils-1.0.8.ebuild:
updated alsa-lib dependency to fix bug #79205.
diff --git a/media-sound/alsa-utils/files/alsasound b/media-sound/alsa-utils/files/alsasound
index 7755fa2beefd..99f35aa9276a 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.21 2004/11/29 21:33:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.22 2005/01/31 21:44:54 eradicator Exp $
#
# Gentoo users: add this script to 'boot' run level.
# ==================================================
@@ -157,7 +157,6 @@ terminate() {
restore_mixer() {
if [ ! -r $asoundcfg ]; then
ewarn "No mixer config in $asoundcfg, you have to unmute your card!"
- return 1
elif [ -x $alsactl ]; then
CARDS="$(cat /proc/asound/cards | awk '/: / { print $1 }')"
for CARDNUM in ${CARDS}