diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-05-01 12:54:56 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:09 +0100 |
| commit | d00704447a2f95f49a06925d40576522ffbfe850 (patch) | |
| tree | 7fed8d6cc23fb804ba393aac2c5237b0c0c765fe | |
| parent | 1bad81c0450e84a94dc1d5f4ead9886f15749b80 (diff) | |
| download | live-boot-d00704447a2f95f49a06925d40576522ffbfe850.tar.gz live-boot-d00704447a2f95f49a06925d40576522ffbfe850.zip | |
Merging casper 1.212.
| -rw-r--r-- | docs/ChangeLog.casper | 17 | ||||
| -rwxr-xr-x | scripts/live-bottom/15autologin | 2 | ||||
| -rwxr-xr-x | scripts/live-bottom/42disable_apparmor | 39 |
3 files changed, 18 insertions, 40 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index d240eb8..3ad3a18 100644 --- 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 --- 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 |