From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 13:11:49 +0000 (+0200)
Subject: Adding noapparmor boot parameter.
X-Git-Tag: debian/2.0.15-1~693
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=dbb49fbb8d4f5869e3105a2831fbbc41beb8b440;hp=6a67fcfadaecc7c2485e89af98b06c89e4c6a8c6;p=live-boot-grml.git

Adding noapparmor boot parameter.
---

diff --git a/scripts/live b/scripts/live
index 15d5dc8..b883c92 100755
--- a/scripts/live
+++ b/scripts/live
@@ -170,6 +170,11 @@ Arguments ()
 				export NOACCESSIBILITY
 				;;
 
+			noapparmor)
+				NOAPPARMOR="Yes"
+				export NOAPPARMOR
+				;;
+
 			noaptcdrom)
 				NOAPTCDROM="Yes"
 				export NOAPTCDROM
diff --git a/scripts/live-bottom/42disable_cups_apparmor b/scripts/live-bottom/42disable_cups_apparmor
index 588214e..09d1869 100755
--- a/scripts/live-bottom/42disable_cups_apparmor
+++ b/scripts/live-bottom/42disable_cups_apparmor
@@ -20,6 +20,11 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOAPPARMOR}" ]
+then
+	exit 0
+fi
+
 . /scripts/live-functions
 
 log_begin_msg "Disabling AppArmor profile for Cups..."