X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=febootstrap.sh;h=654d51fa65a22212468ab92b8185214aa84e16fb;hb=107e65aca6411c2d1a9efb25c1f08e52d5a3dec3;hp=0b384113100308305e1a8b5d57fdb940c449fcf1;hpb=b1078f9a7d0fc70770216a8d49e544ae67d4a687;p=febootstrap.git diff --git a/febootstrap.sh b/febootstrap.sh index 0b38411..654d51f 100755 --- a/febootstrap.sh +++ b/febootstrap.sh @@ -47,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) @@ -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 <> $tmpdir/febootstrap.repo < /dev/null; pwd) # This is necessary to keep yum happy. It's not clear why yum can't # just create this file itself. @@ -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