From f5557bea523ac3bbab148c7990cf24a75179ff43 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 4 Dec 2014 22:06:04 +0100 Subject: [PATCH] Also load 99porterbox-extra-apt-options and 99porterbox-extra-sources with profile buildd-dsa --- modules/porterbox/files/setup-dchroot | 3 ++- .../files/schroot-setup.d/99porterbox-extra-apt-options | 2 +- .../schroot/files/schroot-setup.d/99porterbox-extra-sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/porterbox/files/setup-dchroot b/modules/porterbox/files/setup-dchroot index e5ea8ac3a..b65d7b5c0 100755 --- 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 db240dace..103653152 100755 --- 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 2bdff1bb1..029b3828e 100755 --- 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" -- 2.20.1