blob: 873c6968276c92ae8fa8bcdb842956b39e2f29fa (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From 42156d2b5ac797e5f28f8d0d38b691053f3f6fc7 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Fri, 17 Oct 2014 14:43:18 +0200
Subject: launch: Avoid specifically starting PA and rely on autospawn/socket
activation
This --start is patched out in several downstreams to allow users to easily
disable PA by simply disabling autospawn.
If autospawn is enabled, then the first pactl command will start it and if not
it will fail and the script will exit.
When switching to systemd socket activation, we very much do not want to
start PA manually here. We could replace it with a
systemctl --user start pulseaudio
but really it just makes sense to rely on the socket activation as this
should apply equally to non-systemd setups which use PA's own autospawn.
diff --git a/src/daemon/start-pulseaudio-x11.in b/src/daemon/start-pulseaudio-x11.in
index 620e50f..63ed740 100755
--- a/src/daemon/start-pulseaudio-x11.in
+++ b/src/daemon/start-pulseaudio-x11.in
@@ -19,8 +19,6 @@
set -e
-@PA_BINARY@ --start "$@"
-
if [ x"$DISPLAY" != x ] ; then
@PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null
--
cgit v0.10.2
|
