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

diff --git a/febootstrap.sh b/febootstrap.sh
index fc819fe..6b46ed4 100755
--- a/febootstrap.sh
+++ b/febootstrap.sh
@@ -18,6 +18,8 @@
 #
 # Written by Richard W.M. Jones <rjones@redhat.com>
 
+unset CDPATH
+
 TEMP=`getopt \
         -o g:i:p:u: \
         --long groupinstall:,group-install:,help,install:,noclean,no-clean,proxy:,updates: \
@@ -45,7 +47,7 @@ while true; do
 	-i|--install)
 	    packages[i++]="$2"
 	    shift 2;;
-	--groupinstall|--group-install)
+	-g|--groupinstall|--group-install)
 	    packages[i++]="@$2"
 	    shift 2;;
 	-p|--proxy)
@@ -80,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
@@ -115,7 +117,7 @@ fi
 
 # Add the updates repository if asked.
 case "$updates" in
-    none|no)
+    ""|none|no)
 	;;
     *://*)
 	cat >> $tmpdir/febootstrap.repo <<EOF
@@ -128,6 +130,7 @@ gpgcheck=0
 $proxy
 baseurl=$updates
 EOF
+addrepo=febootstrap-updates
 	;;
     *)
 	cat >> $tmpdir/febootstrap.repo <<EOF
@@ -140,6 +143,7 @@ gpgcheck=0
 $proxy
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=$updates&arch=$arch
 EOF
+addrepo=febootstrap-updates
 	;;
 esac
 
@@ -166,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?
@@ -202,18 +209,24 @@ else
     make_device_nodes
 fi
 
+repos=febootstrap
+if [ -n "$addrepo" ]; then
+    repos="$repos,$addrepo"
+fi
+
 # Run yum.
 run_yum ()
 {
     yum \
 	-y -c "$tmpdir"/febootstrap.repo \
-	--disablerepo=* --enablerepo=febootstrap \
+	--disablerepo=* --enablerepo=$repos \
 	--noplugins --nogpgcheck \
 	--installroot="$target" \
 	install "$@"
 }
 export -f run_yum
 export tmpdir
+export repos
 
 if [ $(id -u) -ne 0 ]; then
     # Bash doesn't support exporting array variables, hence this
@@ -227,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