Changeset 981


Ignore:
Timestamp:
Feb 19, 2008, 11:09:28 AM (10 years ago)
Author:
dkg
Message:

debirf: cleaned up some stupid errors related to the GPG verification of debootstrap which showed up during testing.

File:
1 edited

Legend:

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

    r980 r981  
    8181create_debootstrap() {
    8282    mkdir -p "$DEBIRF_ROOT"
    83     local KROPT
    8483    if [ "$DEBIRF_KEYRING" != 'noverify' ] ; then
    8584        [ -r "$DEBIRF_KEYRING" ] || failure "Cannot read keyring '$DEBIRF_KEYRING' for debootstrap verification."
    86     else
    87         KROPT=--keyring=$DEBIRF_KEYRING
     85        local DEBIRF_KROPT="--keyring=$DEBIRF_KEYRING"
     86    else
     87        unset -v DEBIRF_KROPT
    8888    fi
    8989    if [ "$ROOT_BUILD" = 'true' ] ; then
    90         /usr/sbin/debootstrap --exclude="$EXCLUDE" ${KROPT+"$KROPT"} "$DEBIRF_DISTRO" "$DEBIRF_ROOT" "$DEBIRF_MIRROR"
    91     else
    92         fakeroot_if_needed fakechroot /usr/sbin/debootstrap --variant=fakechroot --include="$INCLUDE" ${KROPT+"$KROPT"} --exclude="$EXCLUDE" "$DEBIRF_DISTRO" "$DEBIRF_ROOT" "$DEBIRF_MIRROR"
     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"
    9393    fi
    9494    fakeroot_if_needed mv "$DEBIRF_ROOT"/var/log/bootstrap.log "$DEBIRF_BUILDD"/.bootstrap.log
     
    264264make() {
    265265    # option parsing
    266     TEMP=$(getopt --options -hcnosrwgdik: --longoptions help,check-vars,new,overwrite,skip,root-build,no-warning,gpg-keyringno-initrd,initrd-only,kernel: -n "$CMD" -- "$@")
     266    TEMP=$(getopt --options -hcnosrwg:dik: --longoptions help,check-vars,new,overwrite,skip,root-build,no-warning,gpg-keyring:,no-initrd,initrd-only,kernel: -n "$CMD" -- "$@")
    267267
    268268    if [ $? != 0 ] ; then
Note: See TracChangeset for help on using the changeset viewer.