Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-18 14:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert the debugging code in the apparmor cache generation, touch the cache files to sanitize the timestamps

Browse Source
This commit is contained in:
Oliver Grawert 2015-08-12 12:16:58 +02:00
parent bc53334a19
commit 93deed0c3a
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.339) UNRELEASED; urgency=medium
* revert the apparmor-super-noise change, issue is found
* touch the cache files during build to prevent timestamp issues in the future
-- Oliver Grawert <ogra@ubuntu.com> Wed, 12 Aug 2015 12:14:47 +0200
livecd-rootfs (2.338) wily; urgency=medium livecd-rootfs (2.338) wily; urgency=medium
[ Łukasz Zemczak ] [ Łukasz Zemczak ]

27
live-build/ubuntu-touch/hooks/90-precompile-apparmor-policies.chroot
View File

@ -2,16 +2,6 @@
FEATURES=/var/cache/apparmor/.features FEATURES=/var/cache/apparmor/.features
echo "date is: `date`"
touch /custom/cache/apparmor/test-timestamp.before
echo "I: Content of the /custom dir before apparmor runs:"
ls -lR /custom
echo "I: Content of the apparmor caches before:"
ls -lR /var/lib/apparmor
ls -lR /var/cache/apparmor
echo "I: precompiling click apparmor policies" echo "I: precompiling click apparmor policies"
/sbin/apparmor_parser -v -M ${FEATURES} -Q --write-cache --cache-loc=/var/cache/apparmor/ `find /var/lib/apparmor/profiles/ -maxdepth 1 -type f -not -path '*/\.*'` /sbin/apparmor_parser -v -M ${FEATURES} -Q --write-cache --cache-loc=/var/cache/apparmor/ `find /var/lib/apparmor/profiles/ -maxdepth 1 -type f -not -path '*/\.*'`
@ -22,15 +12,6 @@ echo "I: precompiling custom click apparmor policies"
mkdir -p /custom/cache/apparmor mkdir -p /custom/cache/apparmor
/sbin/apparmor_parser -v -M ${FEATURES} -Q --write-cache --cache-loc=/custom/cache/apparmor/ `find /var/lib/apparmor/profiles/ -maxdepth 1 -type f -not -path '*/\.*'` /sbin/apparmor_parser -v -M ${FEATURES} -Q --write-cache --cache-loc=/custom/cache/apparmor/ `find /var/lib/apparmor/profiles/ -maxdepth 1 -type f -not -path '*/\.*'`
touch /custom/cache/apparmor/test-timestamp.after
echo "I: Content of the /custom dir after apparmor ran:"
ls -lR /custom
echo "I: Content of the apparmor caches after:"
ls -lR /var/lib/apparmor
ls -lR /var/cache/apparmor
#get the apparmor manifests and profiles #get the apparmor manifests and profiles
mkdir -p /custom/lib/apparmor/clicks mkdir -p /custom/lib/apparmor/clicks
mkdir -p /custom/lib/apparmor/profiles mkdir -p /custom/lib/apparmor/profiles
@ -68,7 +49,7 @@ for manifest in /var/lib/apparmor/clicks/*; do
fi fi
done done
echo "I: Content of the final apparmor files:" ls -l /custom/cache/apparmor/
ls -lR /custom echo "I: touching cache files to sanitize possible timestamp issues"
ls -lR /var/lib/apparmor touch /custom/cache/apparmor/*
ls -lR /var/cache/apparmor ls -l /custom/cache/apparmor/