diff options
| -rw-r--r-- | docs/ChangeLog.casper | 10 | ||||
| -rwxr-xr-x | scripts/live-bottom/42disable_apparmor (renamed from scripts/live-bottom/42disable_cups_apparmor) | 11 |
2 files changed, 12 insertions, 9 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 2497f33..1db8326 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,13 @@ +casper (1.102) gutsy; urgency=low + + * Rename 42disable_cups_apparmor to 42disable_apparmor and remove AppArmor's + rc.d startup links instead of just disabling the cups profile. AA profiles + will not generally work on the live system, so disabling it completely + allows us to ship more profiles without worrying any further. + (LP: #131976) + + -- Martin Pitt <martin.pitt@ubuntu.com> Fri, 14 Sep 2007 08:37:50 +0200 + casper (1.101) gutsy; urgency=low * Add scripts/casper-bottom/42disable_cups_apparmor: Disable AppArmor diff --git a/scripts/live-bottom/42disable_cups_apparmor b/scripts/live-bottom/42disable_apparmor index 09d1869..d325ddb 100755 --- a/scripts/live-bottom/42disable_cups_apparmor +++ b/scripts/live-bottom/42disable_apparmor @@ -27,17 +27,10 @@ fi . /scripts/live-functions -log_begin_msg "Disabling AppArmor profile for Cups..." +log_begin_msg "Disabling AppArmor (does not work with stacked file systems)..." # live-initramfs script -# workaround for AppArmor bug #131976 - -PROFILE=/root/etc/apparmor.d/usr.sbin.cupsd - -if [ -e "$PROFILE" ] -then - sed -i '/{/ s/{/flags=(complain) {/' $PROFILE -fi +chroot /root update-rc.d -f apparmor remove log_end_msg |