summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-05-01 12:15:06 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:08 +0100
commit8eb002767205358584bcf7125e8da19893ee4e33 (patch)
treeb7ba550f25c5b55129e87bd0da4ee1a828b8bc2e
parentfd68eaed79f1cc8f9713f64f2b3963359c4513ae (diff)
downloadlive-boot-8eb002767205358584bcf7125e8da19893ee4e33.tar.gz
live-boot-8eb002767205358584bcf7125e8da19893ee4e33.zip
Merging casper 1.205.
-rw-r--r--docs/ChangeLog.casper9
-rwxr-xr-xscripts/live-bottom/25configure_init5
2 files changed, 14 insertions, 0 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 829e223..0ac3653 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,12 @@
+casper (1.205) karmic; urgency=low
+
+ * scripts/casper-bottom/25configure_init: Disable sreadahead on live CD
+ boot. Not only does it profile the live CD boot to no benefit, but it
+ also looks as if it may be responsible for breaking Wubi installs by
+ reading from partman's synchronisation FIFOs (LP: #439279).
+
+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 20 Oct 2009 17:32:02 +0100
+
casper (1.204) karmic; urgency=low
* scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index 67e21a6..488a1dd 100755
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -108,6 +108,11 @@ then
chmod -x /root/sbin/readahead-list
fi
+# Disable sreadahead too since we don't ship a pack file for it anyway, so
+# all we'll end up doing is profiling the live CD boot. sreadahead also
+# breaks partman occasionally by reading from its synchronisation FIFOs.
+rm -f /root/etc/init/sreadahead.conf
+
log_end_msg
exit 0