Fix snapd.apparmor.service

3 files changed, 11 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 588631a625d7..b4eb50ec60cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = snapd-confinement
 	pkgdesc = Service and tools for management of snap packages (with confinement enabled).
 	pkgver = 2.0.10
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/snapcore/snapd
 	install = snapd.install
 	arch = i686
@@ -25,7 +25,7 @@ pkgbase = snapd-confinement
 	source = disable-devmode-enforcing.patch
 	md5sums = SKIP
 	md5sums = 1d841a1d09ba86945551dfc5c5658b2e
-	md5sums = 53722064f5e270fd7530de6ba4590f04
+	md5sums = f53ccd2070be9165c0790ea6684c5999
 	md5sums = 7fd19e053051825b189914cedb95c3e7
 	md5sums = 48be5347e87d12f2b200e46d11da3a7a
 
diff --git a/PKGBUILD b/PKGBUILD
index 136a83417179..ec2443d36ba7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=snapd-confinement
 _pkgname=snapd
 pkgver=2.0.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Service and tools for management of snap packages (with confinement enabled)."
 arch=('i686' 'x86_64')
 url="https://github.com/snapcore/snapd"
@@ -24,7 +24,7 @@ source=("git+https://github.com/snapcore/$_pkgname.git#tag=$pkgver"
         'disable-devmode-enforcing.patch')
 md5sums=('SKIP'
          '1d841a1d09ba86945551dfc5c5658b2e'
-         '53722064f5e270fd7530de6ba4590f04'
+         'f53ccd2070be9165c0790ea6684c5999'
          '7fd19e053051825b189914cedb95c3e7'
          '48be5347e87d12f2b200e46d11da3a7a')
 
@@ -43,15 +43,14 @@ prepare() {
   # above describes.
   mkdir -p "$(dirname "$GOPATH/src/${_gourl}")"
   ln --no-target-directory -fs "$srcdir/$_pkgname" "$GOPATH/src/${_gourl}"
+}
 
+build() {
+  export GOPATH="$srcdir/go"
   # Use get-deps.sh provided by upstream to fetch go dependencies using the
   # godeps tool and dependencies.tsv (maintained upstream).
   cd "$GOPATH/src/${_gourl}"
   ./get-deps.sh
-}
-
-build() {
-  export GOPATH="$srcdir/go"
   # Build/install snap and snapd
   go install "${_gourl}/cmd/snap"
   go install "${_gourl}/cmd/snapd"
diff --git a/snapd.apparmor.service b/snapd.apparmor.service
index 7b1d123bf81c..1ad0ee00cc05 100644
--- a/snapd.apparmor.service
+++ b/snapd.apparmor.service
@@ -1,13 +1,12 @@
 [Unit]
 Description=Snap AppArmor profiles
-DefaultDependencies=no
-After=local-fs.target
-Before=sysinit.target
+After=apparmor.service
+Before=snapd.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/find /var/lib/snapd/apparmor/profiles -maxdepth 1 -type f -exec /usr/bin/apparmor_parser -r {} +
-ExecStop=/usr/bin/find /var/lib/snapd/apparmor/profiles -maxdepth 1 -type f -exec /usr/bin/apparmor_parser -R {} +
+ExecStart=-/usr/bin/find /var/lib/snapd/apparmor/profiles -maxdepth 1 -type f -exec /usr/bin/apparmor_parser -r {} +
+ExecStop=-/usr/bin/find /var/lib/snapd/apparmor/profiles -maxdepth 1 -type f -exec /usr/bin/apparmor_parser -R {} +
 RemainAfterExit=yes
 
 [Install]