aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoïc Minier <lool@dooz.org>2010-01-02 10:54:43 +0100
committerLoïc Minier <lool@dooz.org>2010-01-02 10:54:43 +0100
commit4a573bcd0d272747c2020071f29570668f81a249 (patch)
tree1be69ecb35a616b51496cb9ebec9db72ee9c1bf2
parent0c9d0393f073ff3465645ee77df634bf8ea03546 (diff)
downloadpbuilder-4a573bcd0d272747c2020071f29570668f81a249.tar
pbuilder-4a573bcd0d272747c2020071f29570668f81a249.tar.gz
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.
-rwxr-xr-xpbuilder-createbuildenv5
1 files changed, 4 insertions, 1 deletions
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