X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=febootstrap.sh;h=2965a7e51227821dd51d5a6a72b9c9f3847f616a;hb=9a0c16b08b403512835d165dd5f259e35091a128;hp=654d51fa65a22212468ab92b8185214aa84e16fb;hpb=107e65aca6411c2d1a9efb25c1f08e52d5a3dec3;p=febootstrap.git diff --git a/febootstrap.sh b/febootstrap.sh index 654d51f..2965a7e 100755 --- a/febootstrap.sh +++ b/febootstrap.sh @@ -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