From 70658c34cf90dad9cc28709cb175b9aa78f24e0c Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Mon, 22 Jul 2013 11:36:21 +0100
Subject: [PATCH] Run builds under eatmydata.  (This doesn't actually seem to
 help very much - it shaves a minute off a 48-minute test build on my laptop -
 but it will stop people being distracted by it.)

---
 BuildLiveCD      | 4 ++--
 debian/changelog | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/BuildLiveCD b/BuildLiveCD
index 925d8f43..f5b6e15a 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -108,7 +108,7 @@ for STE in $SUITES; do
     if [ -d ~/build-${STE}-live/chroot-${STE} ]; then
 	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -qq update || true
 	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y dist-upgrade || true
-	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y install livecd-rootfs || true
+	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y install livecd-rootfs eatmydata || true
 	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y --install-recommends install ubuntu-defaults-builder || true
     fi
 done
@@ -149,7 +149,7 @@ for STE in $SUITES; do
     else
 	COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}"
     fi
-    if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && $COMMAND" >> ${LOG} 2>&1; then
+    if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && eatmydata -- $COMMAND" >> ${LOG} 2>&1; then
 	rm -f ${PUBDIR}current
 	ln -sf ${NOW} ${PUBDIR}current
 
diff --git a/debian/changelog b/debian/changelog
index 031e2aa3..94ce9a6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.164) UNRELEASED; urgency=low
+
+  * Run builds under eatmydata.  (This doesn't actually seem to help very
+    much - it shaves a minute off a 48-minute test build on my laptop - but
+    it will stop people being distracted by it.)
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 22 Jul 2013 11:35:23 +0100
+
 livecd-rootfs (2.163) saucy; urgency=low
 
   * point click package install to http://archive-team.internal/click_packages