From 89dddd357af8851a938fbfc364f6f5c87496341d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 4 Jun 2015 22:55:30 +0200 Subject: [PATCH] revert r1120,r1121 and do not pre-generate the apparmor cache during live-build --- debian/changelog | 8 -------- .../ubuntu-core/hooks/90_precompile-apparmor.chroot | 11 ----------- 2 files changed, 19 deletions(-) delete mode 100644 live-build/ubuntu-core/hooks/90_precompile-apparmor.chroot diff --git a/debian/changelog b/debian/changelog index 4e92bb78..8d9d2cc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,3 @@ -livecd-rootfs (2.307) UNRELEASED; urgency=low - - * live-build/ubuntu-core/hooks/90_pecompile-apparmor.chroot: - - generate /etc/apparmod.d/cache files during image build to - avoid out-of-sync issue with profiles and cache (LP: #1460152) - - -- Michael Vogt Mon, 01 Jun 2015 12:53:22 +0200 - livecd-rootfs (2.306) wily; urgency=medium * Create hooks and image build config for the ubuntu-desktop-next diff --git a/live-build/ubuntu-core/hooks/90_precompile-apparmor.chroot b/live-build/ubuntu-core/hooks/90_precompile-apparmor.chroot deleted file mode 100644 index c283f95f..00000000 --- a/live-build/ubuntu-core/hooks/90_precompile-apparmor.chroot +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# -# similar to -# live-build/ubuntu-touch/hooks/90-precompile-apparmor-policies.chroot -# but we only care about the system apparmor (see LP: #1460152) - -set -e - -echo "I: precompiling deb apparmor policies" -/sbin/apparmor_parser -Q --write-cache --cache-loc=/etc/apparmor.d/cache/ $(find /etc/apparmor.d/ -maxdepth 1 -type f -not -path '*/\.*') -