diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 15:11:48 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:31:05 +0100 |
| commit | 95a72c82ab85be5e582b7ac21239165bce21e179 (patch) | |
| tree | 7a68ddc6da02c8a8f392a8267a6c27160589fe20 | |
| parent | ba92d70df7c43aad50119ee457e4f0a8a48523b6 (diff) | |
| download | live-boot-95a72c82ab85be5e582b7ac21239165bce21e179.tar.gz live-boot-95a72c82ab85be5e582b7ac21239165bce21e179.zip | |
Merging casper 1.101.
| -rw-r--r-- | docs/ChangeLog.casper | 9 | ||||
| -rw-r--r-- | scripts/live-bottom/42disable_cups_apparmor | 29 |
2 files changed, 38 insertions, 0 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 159e31a..2497f33 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,12 @@ +casper (1.101) gutsy; urgency=low + + * Add scripts/casper-bottom/42disable_cups_apparmor: Disable AppArmor + protection for cups on the live CD by switching the profiles to complain + mode. This is necessary until AppArmor works properly on stacked file + systems. (LP: #131976) + + -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 12 Sep 2007 16:44:02 +0200 + casper (1.100) gutsy; urgency=low * scripts/casper-bottom/41apt_cdrom: Remove unnecessary /root/cdrom diff --git a/scripts/live-bottom/42disable_cups_apparmor b/scripts/live-bottom/42disable_cups_apparmor new file mode 100644 index 0000000..4a53444 --- /dev/null +++ b/scripts/live-bottom/42disable_cups_apparmor @@ -0,0 +1,29 @@ +#!/bin/sh +# workaround for AppArmor bug #131976 + +PREREQ="" +DESCRIPTION="Disabling AppArmor profile for Cups..." + +. /scripts/casper-functions + +prereqs() +{ + echo "$PREREQ" +} + +case $1 in +# get pre-requisites +prereqs) + prereqs + exit 0 + ;; +esac + +log_begin_msg "$DESCRIPTION" + +PROFILE=/root/etc/apparmor.d/usr.sbin.cupsd +if [ -e "$PROFILE" ]; then + sed -i '/{/ s/{/flags=(complain) {/' $PROFILE +fi + +log_end_msg |