diff -Nru snap-confine-1.0.38/debian/changelog snap-confine-1.0.38/debian/changelog --- snap-confine-1.0.38/debian/changelog 2016-07-27 12:17:45.000000000 +0000 +++ snap-confine-1.0.38/debian/changelog 2016-07-31 15:14:04.000000000 +0000 @@ -1,3 +1,10 @@ +snap-confine (1.0.38-0ubuntu0.16.04.4) xenial; urgency=medium + + * fix regression in autopkgtests snapd test for root run + X11 applications + + -- Michael Vogt Sun, 31 Jul 2016 17:13:43 +0200 + snap-confine (1.0.38-0ubuntu0.16.04.3) xenial; urgency=medium * fix log-observer interface regression (LP: #1606277) diff -Nru snap-confine-1.0.38/debian/patches/02_fix_root_mount_regression.patch snap-confine-1.0.38/debian/patches/02_fix_root_mount_regression.patch --- snap-confine-1.0.38/debian/patches/02_fix_root_mount_regression.patch 1970-01-01 00:00:00.000000000 +0000 +++ snap-confine-1.0.38/debian/patches/02_fix_root_mount_regression.patch 2016-07-31 15:20:55.000000000 +0000 @@ -0,0 +1,20 @@ +commit ffcb79268af3cffdb7592eb352cc5b7c9281534e +Author: Zygmunt Krynicki +Date: Fri Jul 29 19:18:27 2016 +0200 + + Bind mount /root on classic + + Signed-off-by: Zygmunt Krynicki + +Index: snap-confine-1.0.38/src/mount-support.c +=================================================================== +--- snap-confine-1.0.38.orig/src/mount-support.c ++++ snap-confine-1.0.38/src/mount-support.c +@@ -197,6 +197,7 @@ void setup_snappy_os_mounts() + "/dev", // because it contains devices on host OS + "/etc", // because that's where /etc/resolv.conf lives, perhaps a bad idea + "/home", // to support /home/*/snap and home interface ++ "/root", // because that is $HOME for services + "/proc", // fundamental filesystem + "/snap", // to get access to all the snaps + "/sys", // fundamental filesystem diff -Nru snap-confine-1.0.38/debian/patches/series snap-confine-1.0.38/debian/patches/series --- snap-confine-1.0.38/debian/patches/series 2016-07-27 12:18:55.000000000 +0000 +++ snap-confine-1.0.38/debian/patches/series 2016-07-31 15:13:34.000000000 +0000 @@ -1 +1,2 @@ 01_lp1606277.patch +02_fix_root_mount_regression.patch diff -Nru snap-confine-1.0.38/debian/usr.lib.snapd.snap-confine snap-confine-1.0.38/debian/usr.lib.snapd.snap-confine --- snap-confine-1.0.38/debian/usr.lib.snapd.snap-confine 2016-07-27 12:16:37.000000000 +0000 +++ snap-confine-1.0.38/debian/usr.lib.snapd.snap-confine 2016-07-31 15:20:26.000000000 +0000 @@ -97,6 +97,7 @@ mount options=(rw rbind) /dev/ -> /tmp/snap.rootfs_*/dev/, mount options=(rw rbind) /etc/ -> /tmp/snap.rootfs_*/etc/, mount options=(rw rbind) /home/ -> /tmp/snap.rootfs_*/home/, + mount options=(rw rbind) /root/ -> /tmp/snap.rootfs_*/root/, mount options=(rw rbind) /proc/ -> /tmp/snap.rootfs_*/proc/, mount options=(rw rbind) /snap/ -> /tmp/snap.rootfs_*/snap/, mount options=(rw rbind) /sys/ -> /tmp/snap.rootfs_*/sys/,