Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/pulseaudio:do-not-fork into ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master

Proposed by Alfonso Sanchez-Beato on 2017-06-13
Status: Merged
Approved by: Simon Fels on 2017-06-13
Approved revision: 049cd110c5e6caf3b74b3a2e2d09c3b11cd37aaf
Merged at revision: 40504ddcc5cc1269dc7b0be80b1824fdcbff201f
Proposed branch: ~alfonsosanchezbeato/snappy-hwe-snaps/+git/pulseaudio:do-not-fork
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master
Diff against target: 26 lines (+4/-1)
2 files modified
bin/pulseaudio (+1/-1)
tests/main/installation/task.yaml (+3/-0)
Reviewer Review Type Date Requested Status
Simon Fels Approve on 2017-06-13
Konrad Zapałowicz (community) code Approve on 2017-06-13
System Enablement Bot continuous-integration 2017-06-13 Approve on 2017-06-13
Review via email: mp+325569@code.launchpad.net

Description of the change

Do not unnecessarily fork when starting daemon

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/pulseaudio b/bin/pulseaudio
2index 40c9a85..fa1c474 100755
3--- a/bin/pulseaudio
4+++ b/bin/pulseaudio
5@@ -19,7 +19,7 @@ if [ -e $SNAP_DATA/config/debug ] ; then
6 export LIBASOUND_DEBUG=1
7 fi
8
9-$SNAP/usr/bin/pulseaudio \
10+exec $SNAP/usr/bin/pulseaudio \
11 --exit-idle-time=-1 \
12 --disallow-exit=yes \
13 --disallow-module-loading \
14diff --git a/tests/main/installation/task.yaml b/tests/main/installation/task.yaml
15index d320c61..20d742d 100644
16--- a/tests/main/installation/task.yaml
17+++ b/tests/main/installation/task.yaml
18@@ -7,6 +7,9 @@ execute: |
19 wait_for_pulseaudio
20 systemctl status snap.pulseaudio.pulseaudio | grep -Pzq ': active'
21
22+ # Make sure the daemon's parent is PID 1
23+ pgrep -P 1 pulseaudio
24+
25 # pactl should be able to reach PulseAudio
26 /snap/bin/pactl list | grep -Pzq 'Module'
27

Subscribers

People subscribed via source and target branches