X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fschroot%2Ffiles%2Fsetup-dchroot;h=9a6fcceefb16fbab78c29e543e6000053c4f6f00;hb=666033f76e7e6f95d053f9b3e999ae7a0c472e8a;hp=78e3f2f59bdcd8e7fca7b5c107dc797bdbb4753c;hpb=37182cf8f36563bebe19ab80e7bd320612fd8bde;p=dsa-puppet.git

diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot
index 78e3f2f5..9a6fccee 100755
--- a/modules/schroot/files/setup-dchroot
+++ b/modules/schroot/files/setup-dchroot
@@ -123,6 +123,7 @@ EOF
             if [ -z "$extra" ] && [ -z "$ubuntu" ]; then
                 genschrootconf "$suite" "$arch" "$target" "backports"
                 [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "backports-sloppy"
+                [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "kfreebsd"
                 [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "lts"
                 [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "proposed-updates"
                 [ -n "$buildd" ] && genschrootconf "$suite" "$arch" "$target" "security"
@@ -160,6 +161,7 @@ sbuildnames=""
 ubuntu=""
 groupuser="Debian,guest,d-i"
 grouproot=""
+include="apt"
 users=""
 usersroot=""
 bare=""
@@ -170,7 +172,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)
@@ -191,8 +193,8 @@ do
             bare="1"
             groupuser=""
             grouproot=""
-            users="buildd"
-            usersroot="buildd"
+            users="buildd,buildd2"
+            usersroot="buildd,buildd2"
             personality="buildd"
             suffix="sbuild"
             ;;
@@ -209,6 +211,9 @@ do
             usage
             exit 0
             ;;
+        I)
+            include="$include,$OPTARG"
+            ;;
         K)
             keep="4"
             ;;
@@ -310,7 +315,7 @@ fi
 set -x
 debootstrap \
     --keyring "$keyring" \
-    --include="apt" \
+    --include="$include" \
     --variant=buildd \
     --arch="$arch" \
     "$suite_alias" "$rootdir" "$mirror" "$script"