From 4a573bcd0d272747c2020071f29570668f81a249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sat, 2 Jan 2010 10:54:43 +0100 Subject: debootstrap with --include=apt; for buildd variant Always prepend --include=apt to debootstrap args; this is needed when using --variant=buildd which doesn't include apt since pbuilder calls apt-get in the chroot. Note that this can still be overrident by the end-user by passing another --include= flag via DEBOOTSTRAPOPTS since these flags aren't cumulative in debootstrap. --- pbuilder-createbuildenv | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pbuilder-createbuildenv') diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index cf3eaaf..6508211 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -62,7 +62,10 @@ else exit 1 fi -if ! ( cd "$BUILDPLACE" && "${DEBOOTSTRAP}" ${ARCHITECTURE:+--arch=$ARCHITECTURE} "${DEBOOTSTRAPOPTS[@]}" "$DISTRIBUTION" . "$MIRRORSITE" $DEBOOTSTRAPSCRIPT ) ; then +# FIXME if the end-user passes another --include= to debootstrap in +# DEBOOTSTRAPOPTS, it will override the --include=apt one and apt might not be +# installed +if ! ( cd "$BUILDPLACE" && "${DEBOOTSTRAP}" ${ARCHITECTURE:+--arch=$ARCHITECTURE} --include=apt "${DEBOOTSTRAPOPTS[@]}" "$DISTRIBUTION" . "$MIRRORSITE" $DEBOOTSTRAPSCRIPT ) ; then log "E: $DEBOOTSTRAP failed" exit 1 fi -- cgit v1.2.3