git.annexia.org
/
febootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop febootstrap-run from accepting -g and -i options in error.
[febootstrap.git]
/
febootstrap.sh
diff --git
a/febootstrap.sh
b/febootstrap.sh
index
654d51f
..
67687e5
100755
(executable)
--- a/
febootstrap.sh
+++ b/
febootstrap.sh
@@
-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
# 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?
# Make the device nodes inside the fake chroot.
# (Copied from mock/backend.py) Why isn't there a base package which
# creates these?
@@
-236,6
+239,8
@@
else
fi
# Clean up the yum repository.
fi
# Clean up the yum repository.
+# XXX We shouldn't just rm files.
if [ "$clean" = "yes" ]; then
rm -rf "$target"/var/cache/yum/febootstrap
if [ "$clean" = "yes" ]; then
rm -rf "$target"/var/cache/yum/febootstrap
+ rm -rf "$target"/var/cache/yum/febootstrap-updates
fi
fi