From 15dbc42d72a75f350a503b7c25a38f9080dbc0ae Mon Sep 17 00:00:00 2001
From: Chris Jones <cmsj@tenshu.net>
Date: Mon, 28 Jan 2013 18:08:50 +0000
Subject: [PATCH] Switch locale to C

Remove the explicit installation of an English language pack and instead
just default LANG to C. This settls Perl's noisy warnings and also stops
any side effects of different language build hosts.

Note that this is set right at the start of the build process, so it
should be entirely possible to override if needs be.

Change-Id: Id3b31162d4198fa02dc5a4d11168e57dbcd14a5d
---
 bin/disk-image-create                         | 4 ++++
 elements/base/pre-install.d/01-baseline-tools | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/disk-image-create b/bin/disk-image-create
index 100c2f46c..b9fd911b8 100755
--- a/bin/disk-image-create
+++ b/bin/disk-image-create
@@ -17,6 +17,10 @@
 
 set -e
 
+# Prevent perl from complaining a lot, but also remove any unexpected side-effects
+# of $LANG varying between build hosts
+export LANG=C
+
 SCRIPTNAME=$(basename $0)
 SCRIPT_HOME=$(dirname $0)
 export _LIB=$(dirname $0)/../lib
diff --git a/elements/base/pre-install.d/01-baseline-tools b/elements/base/pre-install.d/01-baseline-tools
index c30c398ee..d5b428a88 100755
--- a/elements/base/pre-install.d/01-baseline-tools
+++ b/elements/base/pre-install.d/01-baseline-tools
@@ -4,5 +4,5 @@
 set -e
 
 apt-get -y update
-apt-get -y install python-software-properties language-pack-en
+apt-get -y install python-software-properties
 add-apt-repository -y ppa:tripleo/demo