X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=febootstrap.sh;h=6b46ed4cdeae682a9ed859e7630f9ceb67e1dc64;hb=e0948419331d56c8f95fdeba2bca12ed5b5f1270;hp=7398516924021c21363f1d88b80fa3d665f15616;hpb=5bd960d0d968d25a14309ed4e1e892c249730fd4;p=febootstrap.git

diff --git a/febootstrap.sh b/febootstrap.sh
index 7398516..6b46ed4 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
@@ -117,7 +117,7 @@ fi
 
 # Add the updates repository if asked.
 case "$updates" in
-    none|no)
+    ""|none|no)
 	;;
     *://*)
 	cat >> $tmpdir/febootstrap.repo <<EOF
@@ -170,6 +170,9 @@ export FAKECHROOT_EXCLUDE_PATH=/proc
 # 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
 
+# 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
 # creates these?
@@ -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