X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=build.common;h=1edfdea1b5bbccb0515438202403d5904c5233a7;hb=e80257bed87749645a34d71f2f6aad613f8e11ff;hp=597d0a079a620eab7249588890f446e509d23b65;hpb=5746de119350bdada4d671eaa5735433f79cedd4;p=build.git

diff --git a/build.common b/build.common
index 597d0a07..1edfdea1 100644
--- a/build.common
+++ b/build.common
@@ -180,7 +180,7 @@ function pl_root_makedevs() {
     mknod -m 600 $vroot/dev/net/tun c 10 200
 
     # For mkinitrd (in case a kernel is being installed)
-    # As well for loop back mounting within a vserver. 
+    # As well as for loop back mounting within a vserver. 
     for i in $(seq 0 255) ; do
 	mknod -m 640 $vroot/dev/loop$i b 7 $i
     done
@@ -330,6 +330,7 @@ cachedir=/var/cache/yum
 debuglevel=2
 logfile=/var/log/yum.log
 pkgpolicy=newest
+multilib_policy=best
 distroverpkg=redhat-release
 tolerant=1
 exactarch=1
@@ -414,23 +415,21 @@ fi
     # Clean yum cache
     echo "* Cleaning up"
 
-    # NOTE: this hack is for Fedora >= 12. we'll let kernel-debug
-    # package satisfy dependencies to install a base system. Then
-    # we'll link to our version of kernel/initrd and clean up
+    # NOTE: this hack is for Fedora >= 12.
+    # if kernel-debug is installed, clean it up
+    # we link to our version of kernel/initrd and clean up
     # kernel-debug manually
-#    set -x
-    pushd $vroot/boot/
-    # we let kernel-debug to be installed to satisfy dependencies. it's time to clean up.
     if rpm --root $vroot --quiet -q kernel-debug ; then
 	echo "* Cleaning up kernel-debug - (workaround for f12)"
+	pushd $vroot/boot/
         rm -rf kernel-boot kernel-bootsmp initrd-boot initrd-bootsmp
         ln -s vmlinuz-*${pldistro}* kernel-boot
         ln -s vmlinuz-*${pldistro}* kernel-bootsmp
         ln -s initrd-*${pldistro}* initrd-boot
         ln -s initrd-*${pldistro}* initrd-bootsmp
         rpm --root $vroot --nodeps -e kernel-debug || :
+	popd
     fi
-    popd
 
     # ignore yum's return code that is basically undefined
     yum $yum_options clean all || :