Ubuntu Pastebin

Paste from zyga at Wed, 17 Aug 2016 16:07:41 +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
41
42
43
diff --git a/snapd.spec b/snapd.spec
index d9360d0..7d78831 100644
--- a/snapd.spec
+++ b/snapd.spec
@@ -28,11 +28,12 @@
 
 Name:           snapd
 Version:        2.11
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        The snapd and snap tools enable systems to work with .snap files
 License:        GPL-3
 URL:            https://%{provider_prefix}
 Source0:        https://%{provider_prefix}/archive/%{version}.tar.gz
+Patch0:         0001-Add-ExecStartPre-that-modprobs-squashfs-to-snapd.ser.patch
 
 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
 ExclusiveArch:  %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
@@ -105,6 +106,7 @@ providing packages with %{import_path} prefix.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 mkdir -p src/github.com/snapcore
@@ -230,7 +232,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 if [ $1 -eq 1 ]; then
         systemctl start snapd.socket
         systemctl start snapd.refresh.timer
-        modprobe squashfs
 fi
 
 %preun
@@ -257,6 +258,8 @@ if [ $1 -eq 0 ]; then
 fi
 
 %changelog
+* Tue Aug 16 2016 Zygmunt Krynicki <me@zygoon.pl> - 2.11-4
+- Use ExecStartPre to load squashfs.ko before snapd starts
 * Tue Aug 16 2016 Zygmunt Krynicki <me@zygoon.pl> - 2.11-3
 - Remove systemd preset (will be requested separately according to distribution
   standards).
Download as text