Changeset 996


Ignore:
Timestamp:
Feb 22, 2008, 5:55:26 PM (10 years ago)
Author:
jrollins
Message:

tweak to create_debootstrap to simplify debootstrap options

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/debirf/fs/usr/bin/debirf

    r981 r996  
    8080
    8181create_debootstrap() {
    82     mkdir -p "$DEBIRF_ROOT"
     82    local OPTS="--include=$INCLUDE --exclude=$EXCLUDE $DEBIRF_DISTRO $DEBIRF_ROOT $DEBIRF_MIRROR"
     83
    8384    if [ "$DEBIRF_KEYRING" != 'noverify' ] ; then
    8485        [ -r "$DEBIRF_KEYRING" ] || failure "Cannot read keyring '$DEBIRF_KEYRING' for debootstrap verification."
    85         local DEBIRF_KROPT="--keyring=$DEBIRF_KEYRING"
    86     else
    87         unset -v DEBIRF_KROPT
    88     fi
     86        OPTS="--keyring=$DEBIRF_KEYRING $OPTS"
     87    fi
     88
     89    mkdir -p "$DEBIRF_ROOT"
     90
    8991    if [ "$ROOT_BUILD" = 'true' ] ; then
    90         /usr/sbin/debootstrap --exclude="$EXCLUDE" ${DEBIRF_KROPT+"$DEBIRF_KROPT"} "$DEBIRF_DISTRO" "$DEBIRF_ROOT" "$DEBIRF_MIRROR"
    91     else
    92         fakeroot_if_needed fakechroot /usr/sbin/debootstrap --variant=fakechroot --include="$INCLUDE" ${DEBIRF_KROPT+"$DEBIRF_KROPT"} --exclude="$EXCLUDE" "$DEBIRF_DISTRO" "$DEBIRF_ROOT" "$DEBIRF_MIRROR"
    93     fi
     92        /usr/sbin/debootstrap $OPTS
     93    else
     94        fakeroot_if_needed fakechroot /usr/sbin/debootstrap --variant=fakechroot $OPTS
     95    fi
     96
    9497    fakeroot_if_needed mv "$DEBIRF_ROOT"/var/log/bootstrap.log "$DEBIRF_BUILDD"/.bootstrap.log
    9598}
Note: See TracChangeset for help on using the changeset viewer.