Changeset 1002


Ignore:
Timestamp:
Feb 28, 2008, 8:58:06 PM (10 years ago)
Author:
dkg
Message:

debirf: error messages are now more verbose, --gpg-keyring can accept relative paths, and --include has been restored to debootstrap step when run as root.

Location:
trunk/debirf/fs/usr
Files:
2 edited

Legend:

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

    r1000 r1002  
    5353                              (requires superuser privileges or CAP_SYS_CHROOT)
    5454    -w|--no-warning           skip superuser warning
    55     -g|--gpg-keyring=KEYRING  keyring to verify Releases during debootstrap
    56                               (if 'noverify', don't verify Releases)           
     55    -g|--gpg-keyring=KEYRING  keyring file for debootstrap verification
     56                              (if 'noverify', don't verify during debootstrap)
    5757    -d|--no-initrd            do not make initramfs
    5858    -i|--initrd-only          just remake initramfs from existing root
     
    8888    fi
    8989    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"
     90        /usr/sbin/debootstrap  --include="$INCLUDE" --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" --exclude="$EXCLUDE" ${DEBIRF_KROPT+"$DEBIRF_KROPT"} "$DEBIRF_DISTRO" "$DEBIRF_ROOT" "$DEBIRF_MIRROR"
    9393    fi
    9494    fakeroot_if_needed mv "$DEBIRF_ROOT"/var/log/bootstrap.log "$DEBIRF_BUILDD"/.bootstrap.log
     
    303303            -g|--gpg-keyring)
    304304                DEBIRF_KEYRING="$2"
     305                # if it's not a full path (starts with a /),
     306                if [ "${DEBIRF_KEYRING#/}" = "$DEBIRF_KEYRING" ]; then
     307                    # make it a full path
     308                    DEBIRF_KEYRING="$(pwd)/$DEBIRF_KEYRING"
     309                fi
    305310                shift 2
    306311                ;;
     
    487492    local GRUB_ELTORITO=${GRUB_ELTORITO:-$(echo "/usr/lib/grub/"*"-pc/stage2_eltorito")}
    488493
    489     ls -l "$KERNEL" > /dev/null || failure "Failed to find a single kernel in '$DEBIRF_PROFILE'"
    490     ls -l "$INITRAMFS" > /dev/null || failure "Failed to find a single initramfs in '$DEBIRF_PROFILE'"
    491     [ -r "$GRUB_ELTORITO" ] || failure "Failed to find a grub El Torito stage2 loader."
     494    ls -l "$KERNEL" > /dev/null || failure "Failed to find a single kernel in '$DEBIRF_PROFILE'.  Maybe you need to run 'debirf make $DEBIRF_PROFILE' first?"
     495    ls -l "$INITRAMFS" > /dev/null || failure "Failed to find a single initramfs in '$DEBIRF_PROFILE'.  Maybe you need to run 'debirf make $DEBIRF_PROFILE' first?"
     496    [ -r "$GRUB_ELTORITO" ] || failure "Failed to find a grub El Torito stage2 loader at '$GRUB_ELTORITO'.  Try specifying it explicitly with the GRUB_ELTORITO environment variable"
    492497
    493498    # get rid of the "iso" directory if it exists.
  • trunk/debirf/fs/usr/share/man/man1/debirf.1

    r980 r1002  
    6464.TP
    6565\fB\-g\fR, \fB\-\-gpg-keyring=KEYRING\fR
    66 Verify the debootstrap stage against the GPG keyring KEYRING (which
    67 should be specified by an absolute path).  By default, the keyring
    68 used is /usr/share/keyrings/debian-archive-keyring.gpg.  If you want
    69 to skip verification entirely (not recommended!), you should use
     66Verify the debootstrap stage against the GPG keyring in the file
     67KEYRING.  By default, the keyring used is
     68/usr/share/keyrings/debian-archive-keyring.gpg.  If you want to skip
     69verification entirely (not recommended!), you should use
    7070--gpg-keyring=noverify.
    7171.TP
Note: See TracChangeset for help on using the changeset viewer.