summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 15:11:49 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:31:05 +0100
commitdbb49fbb8d4f5869e3105a2831fbbc41beb8b440 (patch)
treea519311d9db084683e13e56f488ca9654d24ab2c /scripts
parent6a67fcfadaecc7c2485e89af98b06c89e4c6a8c6 (diff)
downloadlive-boot-dbb49fbb8d4f5869e3105a2831fbbc41beb8b440.tar.gz
live-boot-dbb49fbb8d4f5869e3105a2831fbbc41beb8b440.zip
Adding noapparmor boot parameter.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/live5
-rwxr-xr-xscripts/live-bottom/42disable_cups_apparmor5
2 files changed, 10 insertions, 0 deletions
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..."