Ubuntu Pastebin

Paste from tyhicks at Thu, 6 Oct 2016 19:39:03 +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
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
diff -Nru snapd-2.16+16.10/debian/changelog snapd-2.16+16.10ubuntu1/debian/changelog
--- snapd-2.16+16.10/debian/changelog	2016-09-28 09:31:52.000000000 +0000
+++ snapd-2.16+16.10ubuntu1/debian/changelog	2016-10-06 18:49:40.000000000 +0000
@@ -1,3 +1,10 @@
+snapd (2.16+16.10ubuntu1) yakkety; urgency=medium
+
+  * systemd/systemd.go, systemd/systemd_test.go: Correct the mount arguments
+    when mounting with squashfuse (LP: #1630789)
+
+ -- Tyler Hicks <tyhicks@canonical.com>  Thu, 06 Oct 2016 18:49:40 +0000
+
 snapd (2.16+16.10) yakkety; urgency=medium
 
   * New upstream release, LP: #1628425
diff -Nru snapd-2.16+16.10/systemd/systemd.go snapd-2.16+16.10ubuntu1/systemd/systemd.go
--- snapd-2.16+16.10/systemd/systemd.go	2016-06-27 15:33:55.000000000 +0000
+++ snapd-2.16+16.10ubuntu1/systemd/systemd.go	2016-10-06 16:06:34.000000000 +0000
@@ -441,9 +441,8 @@
 	if osutil.IsDirectory(what) {
 		extra = "Options=bind\n"
 		fstype = "none"
-	}
-
-	if fstype == "squashfs" && useFuse() {
+	} else if fstype == "squashfs" && useFuse() {
+		extra = "Options=ro,allow_other\n"
 		fstype = "fuse.squashfuse"
 	}
 
diff -Nru snapd-2.16+16.10/systemd/systemd_test.go snapd-2.16+16.10ubuntu1/systemd/systemd_test.go
--- snapd-2.16+16.10/systemd/systemd_test.go	2016-06-27 15:33:55.000000000 +0000
+++ snapd-2.16+16.10ubuntu1/systemd/systemd_test.go	2016-10-06 16:06:34.000000000 +0000
@@ -381,6 +381,7 @@
 What=%s
 Where=/apps/foo/1.0
 Type=fuse.squashfuse
+Options=ro,allow_other
 
 [Install]
 WantedBy=multi-user.target
Download as text