From d00704447a2f95f49a06925d40576522ffbfe850 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sat, 1 May 2010 12:54:56 +0200
Subject: Merging casper 1.212.

---
 scripts/live-bottom/15autologin        |  2 +-
 scripts/live-bottom/42disable_apparmor | 39 ----------------------------------
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100755 scripts/live-bottom/42disable_apparmor

(limited to 'scripts')

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 2758c95..143e9f4 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -72,7 +72,7 @@ TimedLoginDelay=10"
 		then
 			sed -i "s/\[daemon\]/\[daemon\]\n$AutologinParameters/" $GDMCustomFile
 		else
-			echo -e "[daemon]\n$AutologinParameters" >> $GDMCustomFile
+			printf '[daemon]\n%s' "$AutologinParameters" >> $GDMCustomFile
 		fi
 	fi
 fi
diff --git a/scripts/live-bottom/42disable_apparmor b/scripts/live-bottom/42disable_apparmor
deleted file mode 100755
index f87cab4..0000000
--- a/scripts/live-bottom/42disable_apparmor
+++ /dev/null
@@ -1,39 +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 (does not work with stacked file systems)"
-
-# live-initramfs script
-
-if [ -x /root/etc/init.d/apparmor ]
-then
-	chroot /root update-rc.d -f apparmor remove
-fi
-
-log_end_msg
-- 
cgit v1.2.3