diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-06-15 15:04:53 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-06-15 15:04:53 +0000 |
| commit | a483d1b78bd69b26b234087ef0bdf472f1ff5049 (patch) | |
| tree | 032522355073dd82d39d9386002b88a15118a103 /media-sound/pulseaudio | |
| parent | Removing ruby-config mask, the packages are gone. Bugs 251833 and 274108. (diff) | |
| download | gentoo-2-a483d1b78bd69b26b234087ef0bdf472f1ff5049.tar.gz gentoo-2-a483d1b78bd69b26b234087ef0bdf472f1ff5049.tar.bz2 gentoo-2-a483d1b78bd69b26b234087ef0bdf472f1ff5049.zip | |
Add a default-off killswitch for systemwide mode in the init script.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/pulseaudio')
| -rw-r--r-- | media-sound/pulseaudio/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/pulseaudio/files/pulseaudio.init.d-4 | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog index f0c57c0b5ea1..ecdd29fc6216 100644 --- a/media-sound/pulseaudio/ChangeLog +++ b/media-sound/pulseaudio/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/pulseaudio # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.126 2009/06/14 17:25:13 ford_prefect Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.127 2009/06/15 15:04:53 flameeyes Exp $ + + 15 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> + files/pulseaudio.init.d-4: + Add a default-off killswitch for systemwide mode in the init script. 14 Jun 2009; Arun Raghavan <ford_prefect@gentoo.org> pulseaudio-0.9.15.ebuild: diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-4 b/media-sound/pulseaudio/files/pulseaudio.init.d-4 index b9c883d664c5..37a1aafe7ec9 100644 --- a/media-sound/pulseaudio/files/pulseaudio.init.d-4 +++ b/media-sound/pulseaudio/files/pulseaudio.init.d-4 @@ -1,7 +1,7 @@ #!/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/pulseaudio/files/pulseaudio.init.d-4,v 1.1 2008/08/03 18:03:46 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/files/pulseaudio.init.d-4,v 1.2 2009/06/15 15:04:52 flameeyes Exp $ depend() { need localmount @@ -59,6 +59,15 @@ depend() { } start() { + if [[ -z ${PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE} ]]; then + eerror "Please don't use system wide PulseAudio unless you read the" + eerror "documentation available at http://www.pulseaudio.org/wiki/WhatIsWrongWithSystemMode" + eerror "" + eerror "When you're done, please set the variable PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE in" + eerror "/etc/conf.d/pulseaudio . Please remember that upstream does not support this mode" + eerror "when used for standard desktop configurations." + return 1 + fi ebegin "Starting pulseaudio" PA_ALL_OPTS="${PA_OPTS} --fail=1 --daemonize=1 --system" start-stop-daemon --start --exec /usr/bin/pulseaudio -- ${PA_ALL_OPTS} |