* mk-sbuild: Generalise --type support and add "file" SCHROOT_TYPE

* mk-sbuild.1: Document the --type argument
This commit is contained in:
Emmet Hikory 2010-02-09 22:10:58 +09:00
parent b5d36d7794
commit 4c598a9247
2 changed files with 14 additions and 6 deletions

5
debian/changelog vendored
View File

@ -8,7 +8,8 @@ ubuntu-dev-tools (0.93) UNRELEASED; urgency=low
* mk-sbuild: automatically install qemu-kvm-extras-static if requested * mk-sbuild: automatically install qemu-kvm-extras-static if requested
* mk-sbuild: conditionally install lvm2 only for lv-snapshot schroots * mk-sbuild: conditionally install lvm2 only for lv-snapshot schroots
* mk-sbuild: rationalise architecture variables * 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 ] [ Loïc Minier ]
* Demote qemu-kvm-extras-static to a Suggests since most people don't build * 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 * mk-sbuild.1: update documentation to reflect alternative config file
names for distro and schroot type overrides. 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 ubuntu-dev-tools (0.92) lucid; urgency=low

View File

@ -41,8 +41,11 @@ Enable distro-specific logic. Currently known distros: "ubuntu" (default)
and "debian". and "debian".
.TP .TP
.B \-\-vg .B \-\-vg
Specify a volume group, and subsequently use SCHROOT_TYPE of "lvm-snapshot" Specify a volume group, and subsequently use a default SCHROOT_TYPE of
rather than "directory" (via aufs) mounts. "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 .SH ENVIRONMENT VARIABLES
.TP .TP
@ -61,6 +64,10 @@ Do not include the \-updates pocket in the installed sources.list.
.B SOURCE_CHROOTS_DIR .B SOURCE_CHROOTS_DIR
use SOURCE_CHROOTS_DIR as home of schroot source directories. (default use SOURCE_CHROOTS_DIR as home of schroot source directories. (default
/var/lib/schroot/chroots) /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 .SH FILES
.TP .TP
@ -77,8 +84,8 @@ See sources.list(5) for more details on the format.
.B $HOME/.mk\-sbuild.schroot.conf[.$SCHROOT_TYPE] .B $HOME/.mk\-sbuild.schroot.conf[.$SCHROOT_TYPE]
Can contain a customized configuration section to be inserted into Can contain a customized configuration section to be inserted into
/etc/schroot/schroot.conf. /etc/schroot/schroot.conf.
If a file with ".lvm-snapshot" or ".directory" is found (based on the presence If a file with ".lvm-snapshot", ".directory", or ".file" is found (based on the
of the \-\-vg argument) that file will use used instead. values of the \-\-vg and \-\-type arguments) that file will use used instead.
See schroot.conf(5) for more details on the format. See schroot.conf(5) for more details on the format.
.SH USING THE CHROOTS .SH USING THE CHROOTS
.TP .TP