diff --git a/debian/changelog b/debian/changelog index 48ec278..3b6a79d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ubuntu-dev-tools (0.149) UNRELEASED; urgency=low + + * mk-sbuild: allow specifying the schroot profile. + + -- Marc Deslauriers Mon, 06 May 2013 09:43:02 -0400 + ubuntu-dev-tools (0.148) unstable; urgency=low * Upload to unstable after the Debian 7.0 release. diff --git a/doc/mk-sbuild.1 b/doc/mk-sbuild.1 index 5862876..0423a77 100644 --- a/doc/mk-sbuild.1 +++ b/doc/mk-sbuild.1 @@ -81,6 +81,9 @@ Size of snapshot LVs (defaults to 4G). .B SCHROOT_CONF_SUFFIX Lines to append to schroot entries. .TP +.B SCHROOT_PROFILE +Profile to use with schroot. (defaults to sbuild) +.TP .B SKIP_UPDATES Do not include the \fB\-updates\fR pocket (same as \fB\-\-skip\-updates\fR) diff --git a/mk-sbuild b/mk-sbuild index 9da4a1f..67b221b 100755 --- a/mk-sbuild +++ b/mk-sbuild @@ -1,12 +1,13 @@ #!/bin/bash # -# Copyright 2006-2011 (C) Canonical Ltd. +# Copyright 2006-2013 (C) Canonical Ltd. # Authors: # Kees Cook # Emmet Hikory # Scott Moser # Stefano Rivera # Steve Langasek +# Marc Deslauriers # # ################################################################## # @@ -38,6 +39,7 @@ SNAPSHOT_SIZE="4G" SOURCE_CHROOTS_DIR="/var/lib/schroot/chroots" SOURCE_CHROOTS_TGZ="/var/lib/schroot/tarballs" CHROOT_SNAPSHOT_DIR="/var/lib/schroot/snapshots" +SCHROOT_PROFILE="sbuild" function usage() { @@ -71,6 +73,7 @@ function usage() echo " SOURCE_CHROOTS_TGZ Directory to store file source chroots" echo " CHROOT_SNAPSHOT_DIR Directory to mount open btrfs snaphshot chroots (default ${CHROOT_SNAPSHOT_DIR})" echo " SCHROOT_CONF_SUFFIX Lines to append to schroot.conf entries" + echo " SCHROOT_PROFILE Profile to use with schroot (default ${SCHROOT_PROFILE})" echo " SKIP_UPDATES Enable --skip-updates" echo " SKIP_PROPOSED Enable --skip-proposed" echo " DEBOOTSTRAP_MIRROR Mirror location (same as --debootstrap-mirror)" @@ -712,7 +715,7 @@ root-groups=$ADMIN_GROUPS #source-root-users=$ADMIN_GROUPS #source-root-groups=$ADMIN_GROUPS type=SCHROOT_TYPE -profile=sbuild +profile=$SCHROOT_PROFILE EOM if [ $EATMYDATA -eq 1 ]; then cat >> "$TEMP_SCHROOTCONF" <