Merging casper 1.212.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index d240eb8..3ad3a18 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,20 @@
+casper (1.212) lucid; urgency=low
+
+  [ Martin Pitt ]
+  * debian/control: Add ${misc:Depends}.
+  * debian/control: Bump Standards-Version to 3.8.3 (no changes necessary).
+
+  [ Colin Watson ]
+  * 15autologin: Use printf rather than echo -e, since its behaviour is
+    portable across shells.
+
+  [ Evan Dandrea ]
+  * Remove scripts/casper-bottom/42disable_apparmor.  Apparmor
+    2.3.1+bzr1312-0ubuntu3 and ifupdown 0.6.8ubuntu26 now no-op when
+    they detect the live CD environment.
+
+ -- Evan Dandrea <evand@ubuntu.com>  Fri, 08 Jan 2010 19:56:27 +0000
+
 casper (1.211) lucid; urgency=low
 
   * Readd scripts/casper-bottom/15autologin changes: derivatives have

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 2758c95..143e9f4 100755 (executable)
--- 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 (executable)
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