diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-11-25 06:58:28 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:03 +0100 |
| commit | 2d45444aa9fdd1ba3a7566215ce1d29787a839e0 (patch) | |
| tree | ed93c51d6ccf8cafa0e788d02bc5fc53a4f9fac2 | |
| parent | 35910eb09ca6c0184a60eed46fc7a5a1c2ab1592 (diff) | |
| download | live-boot-2d45444aa9fdd1ba3a7566215ce1d29787a839e0.tar.gz live-boot-2d45444aa9fdd1ba3a7566215ce1d29787a839e0.zip | |
Merging casper 1.154.
| -rw-r--r-- | docs/ChangeLog.casper | 14 | ||||
| -rwxr-xr-x | scripts/live-bottom/19keyboard | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 97d667c..d366027 100644 --- 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 --- 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} |