From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 11 Aug 2015 13:51:20 +0000 (+0200)
Subject: setup-dchroot: Support including extra packages
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f6e0bfac88441777f8019244e05c5c28a2b5d1e5;p=mirror%2Fdsa-puppet.git

setup-dchroot: Support including extra packages
---

diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot
index 800238316..3ab4e5efe 100755
--- a/modules/schroot/files/setup-dchroot
+++ b/modules/schroot/files/setup-dchroot
@@ -160,6 +160,7 @@ sbuildnames=""
 ubuntu=""
 groupuser="Debian,guest,d-i"
 grouproot=""
+include="apt"
 users=""
 usersroot=""
 bare=""
@@ -170,7 +171,7 @@ cleanup+=(":")
 trap do_cleanup EXIT
 buildd=""
 
-while getopts "a:b:Bcd:Dfg:hKk:m:o:O:p:r:sS:u" OPTION
+while getopts "a:b:Bcd:Dfg:hI:Kk:m:o:O:p:r:sS:u" OPTION
 do
     case $OPTION in
         a)
@@ -209,6 +210,9 @@ do
             usage
             exit 0
             ;;
+        I)
+            include="$include,$OPTARG"
+            ;;
         K)
             keep="4"
             ;;
@@ -310,7 +314,7 @@ fi
 set -x
 debootstrap \
     --keyring "$keyring" \
-    --include="apt" \
+    --include="$include" \
     --variant=buildd \
     --arch="$arch" \
     "$suite_alias" "$rootdir" "$mirror" "$script"