Merging casper 1.154.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 97d667c..d366027 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,17 @@
+casper (1.154) jaunty; urgency=low
+
+  [ Evan Dandrea ]
+  * scripts/casper-bottom/02timezone:
+    - Remove as it's no longer needed and resets the timezone when
+      persistence is enabled (LP: #296855).
+
+  [ Colin Watson ]
+  * Preseed console-setup/optionscode and console-setup/codesetcode to the
+    empty string on boot to avoid debris from the live filesystem build
+    process getting in the way of installation (LP: #94177).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 23 Nov 2008 12:44:45 +0000
+
 casper (1.153) jaunty; urgency=low
 
   * scripts/casper-bottom/10adduser:

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index 5f1d9e7..2bf0b1c 100755 (executable)
--- a/scripts/live-bottom/19keyboard
+++ b/scripts/live-bottom/19keyboard
@@ -89,6 +89,9 @@ then
                live-preseed /root console-setup/modelcode '' false
        fi
 
+       live-preseed /root console-setup/optionscode '' false
+       live-preseed /root console-setup/codesetcode '' false
+
        sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash
 else
        chroot /root /usr/sbin/install-keymap ${kbd}