From: Richard Jones <rjones@redhat.com>
Date: Sun, 10 May 2009 13:39:48 +0000 (+0100)
Subject: Fix -u option (viliar.net.ru)
X-Git-Tag: 1.10~1
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=5bd960d0d968d25a14309ed4e1e892c249730fd4;p=febootstrap.git

Fix -u option (viliar.net.ru)
---

diff --git a/febootstrap.sh b/febootstrap.sh
index 3cadf2a..7398516 100755
--- a/febootstrap.sh
+++ b/febootstrap.sh
@@ -130,6 +130,7 @@ gpgcheck=0
 $proxy
 baseurl=$updates
 EOF
+addrepo=febootstrap-updates
 	;;
     *)
 	cat >> $tmpdir/febootstrap.repo <<EOF
@@ -142,6 +143,7 @@ gpgcheck=0
 $proxy
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=$updates&arch=$arch
 EOF
+addrepo=febootstrap-updates
 	;;
 esac
 
@@ -204,18 +206,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