X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=febootstrap.sh;h=2965a7e51227821dd51d5a6a72b9c9f3847f616a;hb=f0893a62d46605305ae14baba6cae3eebffc6005;hp=91b4f55de5da565838db26b8487cf4e3de6b4d63;hpb=e8d2809e31c5f4c937dc98239118855b2d1d006e;p=febootstrap.git

diff --git a/febootstrap.sh b/febootstrap.sh
index 91b4f55..2965a7e 100755
--- a/febootstrap.sh
+++ b/febootstrap.sh
@@ -82,7 +82,7 @@ mirror="$3"
 
 # Architecture is currently always the same as the current arch.  We
 # cannot do --foreign builds.  See discussion in the manpage.
-arch=$(arch)
+arch=$(uname -m)
 case $arch in
     i?86) arch=i386 ;;
 esac
@@ -168,7 +168,10 @@ export FAKECHROOT_EXCLUDE_PATH=/proc
 # Substitute some statically-linked commands.  This is only supported
 # in fakechroot > 2.9.  For previous versions of fakechroot it is
 # ignored.
-export FAKECHROOT_CMD_SUBST=/sbin/ldconfig=/bin/true:/usr/sbin/glibc_post_upgrade.i686=/bin/true:/usr/sbin/glibc_post_upgrade.x86_64=/bin/true:/usr/sbin/build-locale-archive=/bin/true:/usr/sbin/libgcc_post_upgrade=/bin/true
+export FAKECHROOT_CMD_SUBST=/sbin/ldconfig=/bin/true:/usr/sbin/glibc_post_upgrade.i686=/bin/true:/usr/sbin/glibc_post_upgrade.x86_64=/bin/true:/usr/sbin/build-locale-archive=/bin/true:/usr/sbin/libgcc_post_upgrade=/bin/true:/sbin/new-kernel-pkg=/bin/true:/usr/sbin/nscd=/bin/true
+
+# Use the libraries inside the chroot.
+export LD_LIBRARY_PATH="$target"/usr/lib64:"$target"/usr/lib:"$target"/lib64:"$target"/usr/lib
 
 # Make the device nodes inside the fake chroot.
 # (Copied from mock/backend.py)  Why isn't there a base package which
@@ -237,5 +240,6 @@ fi
 
 # Clean up the yum repository.
 if [ "$clean" = "yes" ]; then
-    rm -rf "$target"/var/cache/yum/febootstrap
+    febootstrap-run "$target" -- rm -rf /var/cache/yum/febootstrap
+    febootstrap-run "$target" -- rm -rf /var/cache/yum/febootstrap-updates
 fi