From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 16 Jan 2013 23:33:46 +0000 (+0100)
Subject: no need to have locales hard-wired in fact
X-Git-Tag: 5.2.1~131
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bea4ff3cfde1652984b63cc383d17c31a2e20d75;p=build.git

no need to have locales hard-wired in fact
---

diff --git a/config.planetlab/develsfa.pkgs b/config.planetlab/develsfa.pkgs
index f78f6dc8..3896228b 100644
--- a/config.planetlab/develsfa.pkgs
+++ b/config.planetlab/develsfa.pkgs
@@ -1,8 +1,11 @@
 # a trimmed set of devel packages for sfa only
 # primarily targets debian
-# incuding stuff like mysql here seems to trigger interactive install screens - e.g. prompting for passwords
+# including stuff like mysql here seems to trigger interactive install screens - e.g. prompting for passwords
 # so we're much better off this way - and it's of course much faster
 #
+# keep perl from whining all the time
+package: locales
+#
 # rpm is unfortunately required at a very early stage..
 package: rpm python-rpm
 #
diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 96b588c9..15d03bb4 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -316,7 +316,6 @@ function devel_or_vtest_tools () {
 	    ;;
 	debootstrap)
 	    $personality vserver $vserver exec apt-get update
-	    $personality vserver $vserver exec apt-get install -y locales
 	    for package in $packages ; do 
 		$personality vserver $vserver exec apt-get install -y $package || \
 		    { echo "WARNING - missing package on debian $package - ignored" ; true; }