Ubuntu Pastebin

Paste from jdstrand at Thu, 6 Oct 2016 12:35:49 +0000

Download as text 
 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
commit fdfba7a9ba0c59890630e8ba65e8573ef0adc2a1
Author: Jamie Strandboge <jamie@ubuntu.com>
Date:   Wed Sep 28 17:32:51 2016 -0500

    allow snap-confine to mount on /dev/pts/ptmx for LXD with /dev/ptmx symlink

Index: snap-confine-1.0.42/src/snap-confine.apparmor.in
===================================================================
--- snap-confine-1.0.42.orig/src/snap-confine.apparmor.in
+++ snap-confine-1.0.42/src/snap-confine.apparmor.in
@@ -93,10 +93,13 @@
     mount options=(rw private) ->  /{tmp/snap.rootfs_*/,}tmp/,
     mount options=(rw bind) /{tmp/snap.rootfs_*/,}tmp/snap.*/tmp/ -> /{tmp/snap.rootfs_*/,}tmp/,
     mount fstype=devpts options=(rw) devpts -> /{tmp/snap.rootfs_*/,}dev/pts/,
-    mount options=(rw bind) /{tmp/snap.rootfs_*/,}dev/pts/ptmx -> /{tmp/snap.rootfs_*/,}dev/ptmx,   # for bind mounting
+    mount options=(rw bind) /{tmp/snap.rootfs_*/,}dev/pts/ptmx -> /{tmp/snap.rootfs_*/,}dev/ptmx,     # for bind mounting
+    mount options=(rw bind) /{tmp/snap.rootfs_*/,}dev/pts/ptmx -> /{tmp/snap.rootfs_*/,}dev/pts/ptmx, # for bind mounting under LXD
+
     # Workaround for LP: #1584456 on older kernels that mistakenly think
     # /dev/pts/ptmx needs a trailing '/'
     mount options=(rw bind) /{tmp/snap.rootfs_*/,}dev/pts/ptmx/ -> /{tmp/snap.rootfs_*/,}dev/ptmx/,
+    mount options=(rw bind) /{tmp/snap.rootfs_*/,}dev/pts/ptmx/ -> /{tmp/snap.rootfs_*/,}dev/pts/ptmx/,
 
     # for running snaps on classic
     mount options=(rw rslave) -> /,
Download as text