From 4c598a92470fb1f8d4048788604d66d06e5c6049 Mon Sep 17 00:00:00 2001
From: Emmet Hikory <persia@ubuntu.com>
Date: Tue, 9 Feb 2010 22:10:58 +0900
Subject: [PATCH] * mk-sbuild: Generalise --type support and add "file"
 SCHROOT_TYPE * mk-sbuild.1: Document the --type argument

---
 debian/changelog |  5 +++--
 doc/mk-sbuild.1  | 15 +++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 155c55b..38451b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,8 @@ ubuntu-dev-tools (0.93) UNRELEASED; urgency=low
   * mk-sbuild: automatically install qemu-kvm-extras-static if requested
   * mk-sbuild: conditionally install lvm2 only for lv-snapshot schroots
   * mk-sbuild: rationalise architecture variables
-  * mk-sbuild: Generalise --type support and add "file"|"tarball" type
+  * mk-sbuild: Generalise --type support and add "file" SCHROOT_TYPE
+  * mk-sbuild.1: Document the --type argument
 
   [ Loïc Minier ]
   * Demote qemu-kvm-extras-static to a Suggests since most people don't build
@@ -21,7 +22,7 @@ ubuntu-dev-tools (0.93) UNRELEASED; urgency=low
   * mk-sbuild.1: update documentation to reflect alternative config file
     names for distro and schroot type overrides.
 
- -- Kees Cook <kees@ubuntu.com>  Tue, 09 Feb 2010 00:14:26 -0800
+ -- Emmet Hikory <persia@ubuntu.com>  Tue, 09 Feb 2010 22:08:56 +0900
 
 ubuntu-dev-tools (0.92) lucid; urgency=low
 
diff --git a/doc/mk-sbuild.1 b/doc/mk-sbuild.1
index 8be08ac..7da0745 100644
--- a/doc/mk-sbuild.1
+++ b/doc/mk-sbuild.1
@@ -41,8 +41,11 @@ Enable distro-specific logic.  Currently known distros: "ubuntu" (default)
 and "debian".
 .TP
 .B \-\-vg
-Specify a volume group, and subsequently use SCHROOT_TYPE of "lvm-snapshot"
-rather than "directory" (via aufs) mounts.
+Specify a volume group, and subsequently use a default SCHROOT_TYPE of
+"lvm-snapshot" rather than "directory" (via aufs) mounts.
+.TP
+.B \-\-type
+Specify a SCHROOT_TYPE.  Supported values are "directory" (default if --vg not specified), "lvm-snapshot" (default if --vg specified), and "file".
 
 .SH ENVIRONMENT VARIABLES
 .TP
@@ -61,6 +64,10 @@ Do not include the \-updates pocket in the installed sources.list.
 .B SOURCE_CHROOTS_DIR
 use SOURCE_CHROOTS_DIR as home of schroot source directories. (default
 /var/lib/schroot/chroots)
+.TP
+.B SOURCE_CHROOTS_TGZ
+use SOURCE_CHROOTS_TGZ as home of schroot source tarballs. (default
+/var/lib/schroot/tarballs)
 
 .SH FILES
 .TP
@@ -77,8 +84,8 @@ See sources.list(5) for more details on the format.
 .B $HOME/.mk\-sbuild.schroot.conf[.$SCHROOT_TYPE]
 Can contain a customized configuration section to be inserted into
 /etc/schroot/schroot.conf.
-If a file with ".lvm-snapshot" or ".directory" is found (based on the presence
-of the \-\-vg argument) that file will use used instead.
+If a file with ".lvm-snapshot", ".directory", or ".file" is found (based on the
+values of the \-\-vg and \-\-type arguments) that file will use used instead.
 See schroot.conf(5) for more details on the format.
 .SH USING THE CHROOTS
 .TP