Also load 99porterbox-extra-apt-options and 99porterbox-extra-sources with profile...

diff --git a/modules/porterbox/files/setup-dchroot b/modules/porterbox/files/setup-dchroot
index e5ea8ac3a36a4abe37ecd72a8462ae9afed05289..b65d7b5c097abdebb776104234543d7988e8bbad 100755 (executable)
--- a/modules/porterbox/files/setup-dchroot
+++ b/modules/porterbox/files/setup-dchroot
@@ -185,7 +185,7 @@ do
             grouproot=""
             users="buildd"
             usersroot="buildd"
-            personality="buildd"
+            personality="buildd-dsa"
             suffix="sbuild"
             ;;
         d)
@@ -287,6 +287,7 @@ debootstrap \
     "$suite" "$rootdir" "$mirror" "$script"
 echo "$tuple" > "$rootdir/etc/debian_chroot"
 echo "force-unsafe-io" > "$rootdir/etc/dpkg/dpkg.cfg.d/force-unsafe-io"
+echo "force-confnew" > "$rootdir/etc/dpkg/dpkg.cfg.d/force-confnew"
 
 cleanup+=("umount $rootdir/dev")
 case "$(uname -s)" in

diff --git a/modules/schroot/files/schroot-setup.d/99porterbox-extra-apt-options b/modules/schroot/files/schroot-setup.d/99porterbox-extra-apt-options
index db240dace3cb7f7cdef2b320ab23a42c2d6c014b..103653152afd0dd878a1c9094ec78e726559fd76 100755 (executable)
--- a/modules/schroot/files/schroot-setup.d/99porterbox-extra-apt-options
+++ b/modules/schroot/files/schroot-setup.d/99porterbox-extra-apt-options
@@ -9,7 +9,7 @@
 
 set -e
 
-[ "$CHROOT_PROFILE" = "dsa" ] || exit 0
+[ "$CHROOT_PROFILE" = "dsa" ] || [ "$CHROOT_PROFILE" = "buildd-dsa" ] || exit 0
 
 . "$SETUP_DATA_DIR/common-data"
 . "$SETUP_DATA_DIR/common-functions"

diff --git a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
index 2bdff1bb1cd624f3ab4d3d6c63a9e2332de5ea1e..029b3828e1f58a9aae26bdfedb11e0ac2ca64d4a 100755 (executable)
--- a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
+++ b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
@@ -9,7 +9,7 @@
 
 set -e
 
-[ "$CHROOT_PROFILE" = "dsa" ] || exit 0
+[ "$CHROOT_PROFILE" = "dsa" ] || [ "$CHROOT_PROFILE" = "buildd-dsa" ] || exit 0
 
 . "$SETUP_DATA_DIR/common-data"
 . "$SETUP_DATA_DIR/common-functions"