workaround for 32bits slice images when running under libvirt where the personality...

[vserver-reference.git] / build.sh

diff --git a/build.sh b/build.sh
index e383edf..60a7904 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -101,6 +101,11 @@ systemslice_count=$(ls ../build/config.${pldistro}/sliceimage-*.pkgs 2> /dev/nul
            echo " * WARNING image $systemslice - yum groupinstall $yum_group failed"
     done
 
+    # running pip or gem requires connectivity, and DNS
+    # so we expose the build-vm's /etc/resolv.conf to the current vdir 
+    mkdir -p ${vdir}/etc
+    cp /etc/resolv.conf ${vdir}/etc
+
     # this requires pip to be available in sliceimage at that point
     # fedora and debian -> python-pip
     # on fedora the command is called pip-python (sigh.)
@@ -164,6 +169,14 @@ 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