diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-07-07 19:36:39 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-07-07 19:36:39 +0000 |
| commit | 265fa1f1b5f4f91ee7a5b5b707d6da743f9345de (patch) | |
| tree | 7f0b5d58a9930a22a4465cf3deecdb094418117f /media-sound | |
| parent | Stable on amd64. (diff) | |
| download | gentoo-2-265fa1f1b5f4f91ee7a5b5b707d6da743f9345de.tar.gz gentoo-2-265fa1f1b5f4f91ee7a5b5b707d6da743f9345de.tar.bz2 gentoo-2-265fa1f1b5f4f91ee7a5b5b707d6da743f9345de.zip | |
Updated init script to work with sparc audio. Closes bug #84412 thanks to Peter Schloemer <dapete@dapete.de>.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/aumix/ChangeLog | 8 | ||||
| -rw-r--r-- | media-sound/aumix/files/aumix.rc6 | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/media-sound/aumix/ChangeLog b/media-sound/aumix/ChangeLog index d3382081ce21..4e35f60913cb 100644 --- a/media-sound/aumix/ChangeLog +++ b/media-sound/aumix/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/aumix -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/ChangeLog,v 1.48 2004/12/29 01:09:48 ciaranm Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/ChangeLog,v 1.49 2005/07/07 19:36:39 eradicator Exp $ + + 07 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> files/aumix.rc6: + Updated init script to work with sparc audio. Closes bug #84412 thanks to + Peter Schloemer <dapete@dapete.de>. 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : Change encoding to UTF-8 for GLEP 31 compliance diff --git a/media-sound/aumix/files/aumix.rc6 b/media-sound/aumix/files/aumix.rc6 index bdfdfbfcc192..21430103ec8a 100644 --- a/media-sound/aumix/files/aumix.rc6 +++ b/media-sound/aumix/files/aumix.rc6 @@ -1,14 +1,14 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/files/aumix.rc6,v 1.9 2004/10/31 10:17:47 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/files/aumix.rc6,v 1.10 2005/07/07 19:36:39 eradicator Exp $ depend() { use modules hotplug coldplug alsasound } checkconfig() { - if [ -z "`egrep 'sound|OSS' /proc/devices`" ] && [ ! -d /proc/asound ] + if ! grep -q 'sound|OSS|sparcaudio' /proc/devices && [[ ! -d /proc/asound ]] then eerror "Sound support has not been compiled into the kernel," eerror "or is disabled. Please check that the correct modules" @@ -16,7 +16,7 @@ checkconfig() { return 1 fi # /dev/mixer can be a symlink - if [ ! -e /dev/mixer ] ; then + if [[ ! -e /dev/mixer ]] ; then eerror "/dev/mixer does not exist, please create it, or load the" eerror "correct modules to enable your card's mixer" return 1 @@ -25,7 +25,7 @@ checkconfig() { start() { checkconfig || return 1 - if [ -f /etc/aumixrc ] ; then + if [[ -f /etc/aumixrc ]] ; then ebegin "Loading Mixer settings" /usr/bin/aumix -f /etc/aumixrc -L >/dev/null 2>&1 else |