From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 9 Jul 2014 11:57:27 +0000 (+0200)
Subject: undo previous change altogether
X-Git-Tag: sliceimage-5.1-8~1
X-Git-Url: http://git.onelab.eu/?p=vserver-reference.git;a=commitdiff_plain;h=ff64f6ea0db0367eaa3e1aab995aae1edfb1d28f

undo previous change altogether
the issue with yum was due to 32bits slivers in lxc nodes not being properly detected
this now is fixed in lxcsu so this change here is now entirely useless
---

diff --git a/build.sh b/build.sh
index 60a7904..53df754 100755
--- a/build.sh
+++ b/build.sh
@@ -169,14 +169,6 @@ postfile=$(pl_locateDistroFile ../build/ ${pldistro} sliceimage.post)
 # fix sudoers config
 [ -f ${vref}/etc/sudoers ] && echo -e "\nDefaults\tlogfile=/var/log/sudo\n" >> ${vref}/etc/sudoers
 
-# make sure 32bit slice images have the right yum config in /etc/yum/vars
-# this issue showed on a f18 64bits node hosting a f14 32bits sliver
-# this workaround probably means the 32bits sliver does not properly run as a 32bits VM
-grep -q i386 ${vref}/etc/slicefamily && {
-    echo i686 > ${vref}/etc/yum/vars/arch 
-    echo i386 > /etc/yum/vars/basearch
-}
-
 # cleanup yum remainings
 rm -rf ${vref}/build ${vref}/longbuildroot