diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 15:11:50 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:31:05 +0100 |
| commit | 3ce6ddcc62f254a781670441a64bac49046b3191 (patch) | |
| tree | 4050663c641015f3a219038633f9dab50fa95fea /scripts | |
| parent | dbb49fbb8d4f5869e3105a2831fbbc41beb8b440 (diff) | |
| download | live-boot-3ce6ddcc62f254a781670441a64bac49046b3191.tar.gz live-boot-3ce6ddcc62f254a781670441a64bac49046b3191.zip | |
Merging casper 1.102.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live-bottom/42disable_apparmor (renamed from scripts/live-bottom/42disable_cups_apparmor) | 11 |
1 files changed, 2 insertions, 9 deletions
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 |