snappy-hwe-snaps

Merge ~robertliu/snappy-hwe-snaps/+git/pulseaudio:unset-xdg_runtime_dir into ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master

  1. Git
  2. lp:~robertliu/snappy-hwe-snaps/+git/pulseaudio
  3. unset-xdg_runtime_dir
  4. Merge into master
Proposed by Robert Liu
Status: Superseded
Proposed branch: ~robertliu/snappy-hwe-snaps/+git/pulseaudio:unset-xdg_runtime_dir
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master
Diff against target: 39 lines (+6/-0)
3 files modified
bin/pactl (+2/-0)
bin/paplay (+2/-0)
bin/parec (+2/-0)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Simon Fels Approve
Review via email: mp+313748@code.launchpad.net

This proposal has been superseded by a proposal from 2017-01-13.

Description of the change

snapd now exports XDG_RUNTIME_DIR for each snap. for PulseAudio which runs in system mode, the XDR_RUNTIME_DIR will be /run/user/0/pulseaudio.snap. However, to create '/run/user/0' is not allowed.

Dec 22 06:43:55 localhost kernel: [ 66.505522] audit: type=1400 audit(1482389035.822:21): apparmor="DENIED" operation="mkdir" profile="snap.pulseaudio.pactl" name="/run/user/0/" pid=1793 comm="pactl" requested_mask="c" denied_mask="c" fsuid=0 ouid=0

I propose that lets unset XDG_RUNTIME_DIR and PulseAudio will fallback to use the home directory (/root/snap/pulseaudio/[rev])

To post a comment you must log in.
Revision history for this message
Simon Fels (morphis) wrote :

LGTM. Triggered CI at https://jenkins.canonical.com/system-enablement/job/generic-build-snap/581/

review: Approve
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:91d1d7b3d23e45bfda5376a14a4291eee6f65420
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/581/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/310/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/489/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/581/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:91d1d7b3d23e45bfda5376a14a4291eee6f65420
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/586/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/314/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/494/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/586/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Simon Fels (morphis) wrote :

Can you rebase on top of master? CI issues are fixed in master now.

~robertliu/snappy-hwe-snaps/+git/pulseaudio:unset-xdg_runtime_dir updated
3be07bd... by Robert Liu

Merge branch 'master' of git+ssh://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio into unset-xdg_runtime_dir

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:3be07bdd54653fe80a45887cedacdf1608072a7f
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/632/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/352
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/540/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/632/rebuild

review: Approve (continuous-integration)

Unmerged commits

3be07bd... by Robert Liu

Merge branch 'master' of git+ssh://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio into unset-xdg_runtime_dir

91d1d7b... by Robert Liu

Unset XDG_RUNTIME_DIR and let PulseAudio fallback to HOME

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/bin/pactl b/bin/pactl
index 97e23b2..f39f21b 100755
--- a/bin/pactl
+++ b/bin/pactl
@@ -23,6 +23,8 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/pulseaudio:$SNAP/usr/lib/p
23export PULSE_CLIENTCONFIG=$SNAP/etc/pulse/client.conf23export PULSE_CLIENTCONFIG=$SNAP/etc/pulse/client.conf
24export HOME=$SNAP_DATA/home24export HOME=$SNAP_DATA/home
2525
26unset XDG_RUNTIME_DIR
27
26mkdir -p $HOME28mkdir -p $HOME
2729
28$SNAP/usr/bin/pactl $@30$SNAP/usr/bin/pactl $@
diff --git a/bin/paplay b/bin/paplay
index a132d51..eb759c9 100755
--- a/bin/paplay
+++ b/bin/paplay
@@ -23,6 +23,8 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/pulseaudio:$SNAP/usr/lib/p
23export PULSE_CLIENTCONFIG=$SNAP/etc/pulse/client.conf23export PULSE_CLIENTCONFIG=$SNAP/etc/pulse/client.conf
24export HOME=$SNAP_DATA/home24export HOME=$SNAP_DATA/home
2525
26unset XDG_RUNTIME_DIR
27
26mkdir -p $HOME28mkdir -p $HOME
2729
28$SNAP/usr/bin/paplay $@30$SNAP/usr/bin/paplay $@
diff --git a/bin/parec b/bin/parec
index 269e0f8..ea78b35 100755
--- a/bin/parec
+++ b/bin/parec
@@ -23,6 +23,8 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/pulseaudio:$SNAP/usr/lib/p
23export PULSE_CLIENTCONFIG=$SNAP/etc/pulse/client.conf23export PULSE_CLIENTCONFIG=$SNAP/etc/pulse/client.conf
24export HOME=$SNAP_DATA/home24export HOME=$SNAP_DATA/home
2525
26unset XDG_RUNTIME_DIR
27
26mkdir -p $HOME28mkdir -p $HOME
2729
28$SNAP/usr/bin/parec $@30$SNAP/usr/bin/parec $@

Subscribers

People subscribed via source and target branches

to all changes: