X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F42disable_cups_apparmor;h=09d1869750f0384dd84d0232304e9c66932bf050;hb=628bbe5489c8ae252cdf3813e3d431fa6276c302;hp=4a53444cfc9a23dd30d2c36399e75da7e3a57c3a;hpb=8fb206f0553ddd5b61d97aca142cc1ed64c3998e;p=live-boot-grml.git

diff --git a/scripts/live-bottom/42disable_cups_apparmor b/scripts/live-bottom/42disable_cups_apparmor
old mode 100644
new mode 100755
index 4a53444..09d1869
--- a/scripts/live-bottom/42disable_cups_apparmor
+++ b/scripts/live-bottom/42disable_cups_apparmor
@@ -1,29 +1,43 @@
 #!/bin/sh
-# workaround for AppArmor bug #131976
 
-PREREQ=""
-DESCRIPTION="Disabling AppArmor profile for Cups..."
+#set -e
+
+# initramfs-tools header
 
-. /scripts/casper-functions
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# 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
+
+if [ -e "$PROFILE" ]
+then
+	sed -i '/{/ s/{/flags=(complain) {/' $PROFILE
 fi
 
 log_end_msg