Merging casper 1.212.

grml · May 1, 2010 · 59835af · 59835af
1 parent 932d2cf
commit 59835af
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 40 deletions.
diff --git 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
@@ -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