[Buildd-tools-devel] Bug#487588: Bug#487588: Bug#487588: schroot: please add /etc/schroot/schroot.d directory

[Roger Leigh]

Timothy G Abbott <tabbott at MIT.EDU> writes:

> That does exactly what I want.  I'm not sure how I missed it.  Sorry about 
> that.
>
> You may, however, want to document this feature in the files section of 
> the schroot.conf man page.

Absolutely.  Is the following clear enough?

diff --git a/bin/schroot/schroot.1.in b/bin/schroot/schroot.1.in
index 579f30f..f9d2b99 100644
--- a/bin/schroot/schroot.1.in
+++ b/bin/schroot/schroot.1.in
@@ -499,6 +499,11 @@ for further details.
 The system-wide chroot definition file.  This file must be owned by the root
 user, and not be writable by other.
 .TP
+\f[BI]@SCHROOT_CONF_CHROOT_D@\fP
+Additional chroot definitions may be placed in files under this directory.
+They are treated in exactly that same manner as \fI at SCHROOT_CONF@\fP.  Each
+file may contain one or more chroot definitions.
+.TP
 \f[BI]@SCHROOT_CONF_SETUP_D@\fP
 .TP
 \f[BI]@SCHROOT_CONF_EXEC_D@\fP
diff --git a/bin/schroot/schroot.conf.5.in b/bin/schroot/schroot.conf.5.in
index 53dc7e8..531f9b1 100644
--- a/bin/schroot/schroot.conf.5.in
+++ b/bin/schroot/schroot.conf.5.in
@@ -378,6 +378,11 @@ this boils down to \fItrust\fP.
 .I @SCHROOT_CONF@
 The system-wide chroot definition file.  This file must be owned by the root
 user, and not be writable by other.
+.TP
+\f[BI]@SCHROOT_CONF_CHROOT_D@\fP
+Additional chroot definitions may be placed in files under this directory.
+They are treated in exactly that same manner as \fI at SCHROOT_CONF@\fP.  Each
+file may contain one or more chroot definitions.
 .SH AUTHORS
 Roger Leigh.
 .SH COPYRIGHT


Regards,
Roger

-- 
  .''`.  Roger Leigh
 : :' :  Debian GNU/Linux             http://people.debian.org/~rleigh/
 `. `'   Printing on GNU/Linux?       http://gutenprint.sourceforge.net/
   `-    GPG Public Key: 0x25BFB848   Please GPG sign your mail.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/buildd-tools-devel/attachments/20080630/65a22e41/attachment.pgp