From 3ce6ddcc62f254a781670441a64bac49046b3191 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 15:11:50 +0200
Subject: Merging casper 1.102.

---
 docs/ChangeLog.casper                       | 10 +++++++
 scripts/live-bottom/42disable_apparmor      | 36 ++++++++++++++++++++++++
 scripts/live-bottom/42disable_cups_apparmor | 43 -----------------------------
 3 files changed, 46 insertions(+), 43 deletions(-)
 create mode 100755 scripts/live-bottom/42disable_apparmor
 delete mode 100755 scripts/live-bottom/42disable_cups_apparmor

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_apparmor b/scripts/live-bottom/42disable_apparmor
new file mode 100755
index 0000000..d325ddb
--- /dev/null
+++ b/scripts/live-bottom/42disable_apparmor
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+#set -e
+
+# initramfs-tools header
+
+PREREQ=""
+
+prereqs()
+{
+	echo "${PREREQ}"
+}
+
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
+esac
+
+# live-initramfs header
+
+if [ -n "${NOAPPARMOR}" ]
+then
+	exit 0
+fi
+
+. /scripts/live-functions
+
+log_begin_msg "Disabling AppArmor (does not work with stacked file systems)..."
+
+# live-initramfs script
+
+chroot /root update-rc.d -f apparmor remove
+
+log_end_msg
diff --git a/scripts/live-bottom/42disable_cups_apparmor b/scripts/live-bottom/42disable_cups_apparmor
deleted file mode 100755
index 09d1869..0000000
--- a/scripts/live-bottom/42disable_cups_apparmor
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# live-initramfs header
-
-if [ -n "${NOAPPARMOR}" ]
-then
-	exit 0
-fi
-
-. /scripts/live-functions
-
-log_begin_msg "Disabling AppArmor profile for Cups..."
-
-# 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
-
-log_end_msg
-- 
cgit v1.2.3