From 8d908a16d9b55217f95a3d37d1737206eb57b2ca Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Tue, 23 Aug 2011 18:35:45 +0100
Subject: [PATCH] Add a -u option to BuildLiveCD which calls
 ubuntu-defaults-image.

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

diff --git a/BuildLiveCD b/BuildLiveCD
index 31040267..89b703b9 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -33,8 +33,9 @@ SUITES=""
 PROPOSED=""
 IMAGEFORMAT=""
 LIVE_BUILD=false
+UBUNTU_DEFAULTS_LOCALE=""
 
-while getopts :s:r:d:f:pa:l name; do case $name in
+while getopts :s:r:d:f:pa:lu: name; do case $name in
     s)	SUBARCH="$OPTARG";;
     r)	SUBPROJECT="$OPTARG";;
     d)	NEWSUITE="$OPTARG";;
@@ -42,6 +43,7 @@ while getopts :s:r:d:f:pa:l name; do case $name in
     p)	PROPOSED="-p";;
     a)	APT_SOURCE="-A $OPTARG";;
     l)	LIVE_BUILD=:;;
+    u)	UBUNTU_DEFAULTS_LOCALE="$OPTARG";;
 esac; done;
 shift $((OPTIND-1))
 
@@ -112,7 +114,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 ubuntu-defaults-builder || true
     fi
 done
 for STE in $SUITES; do
@@ -145,6 +147,9 @@ for STE in $SUITES; do
 	    exit 1
 	fi
 	COMMAND="PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"
+    elif [ "$UBUNTU_DEFAULTS_LOCALE" ]; then
+	# universe enabled until ubuntu-defaults-zh-cn is moved to main
+	COMMAND="ubuntu-defaults-image --locale ${UBUNTU_DEFAULTS_LOCALE} --arch ${ARCH} --release ${STE} --components main,restricted,universe"
     else
 	COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}"
     fi
diff --git a/debian/changelog b/debian/changelog
index b2d9d3b6..eb84460c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ livecd-rootfs (2.31) UNRELEASED; urgency=low
   * Link binary.iso or binary-hybrid.iso, if found, into the output
     directory for use by BuildLiveCD.
   * Tolerate ubuntu-defaults-image's kernel renaming.
+  * Add a -u option to BuildLiveCD which calls ubuntu-defaults-image.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Tue, 23 Aug 2011 18:28:02 +0100