Merging casper 1.101.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 159e31a..2497f33 100644 (file)
--- 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 (file)
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