* NEWS: Document automatic block-device creation for lvm-snapshot

  chroots.
* TODO: Remove completed item.
* schroot/schroot.conf.5.in: Document automatic block-device
  creation for lvm-snapshot chroots.
* schroot/sbuild-chroot-config.cc (parse_data): Create a
  corresponding block-device chroot for each lvm-snapshot chroot.
  "-source" is appended to the chroot name and its aliases.

8 files changed, 64 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index f90b86e3..967c3ec4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-02-21  Roger Leigh  <rleigh@debian.org>
+
+	* NEWS: Document automatic block-device creation for lvm-snapshot
+	chroots.
+
+	* TODO: Remove completed item.
+
+	* schroot/schroot.conf.5.in: Document automatic block-device
+	creation for lvm-snapshot chroots.
+
+	* schroot/sbuild-chroot-config.cc (parse_data): Create a
+	corresponding block-device chroot for each lvm-snapshot chroot.
+	"-source" is appended to the chroot name and its aliases.
+
 2006-02-20  Roger Leigh  <rleigh@debian.org>
 
 	* schroot/dchroot.1.in: Document how to remove dchroot.conf.
diff --git a/NEWS b/NEWS
index 1d128a13..efc2393a 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,11 @@ configuration.
      backward compatibility with dhchroot, as well as migrating from
      dchroot.
 
+  2) Access to the source device of an "lvm-snapshot" type chroot is
+     simplified.  For a chroot named "snap", a "block-device" type
+     chroot named "snap-source" is created for easy access to the
+     source device.
+
 * Major changes in 0.2.2:
   1) Session metadata is now correctly saved and restored.
 
diff --git a/TODO b/TODO
index 373eada5..7fa4ff32 100644
--- a/TODO
+++ b/TODO
@@ -11,11 +11,6 @@ PENDING
 * Make "session" naming more consistent.
   "run-session-scripts" should be "run-scripts".
 
-* Allow direct access to the original LV of a snapshot chroot type.
-  This is possible now we are using lockdev.  Could the block-device
-  chroot be created automatically, appending "-master" or "-source" to
-  the lvm-snapshot chroot name?
-
 * Translation of strings in headers.
 
 PLANNED
diff --git a/po/en_GB.po b/po/en_GB.po
index 180f2b5d..6b186646 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: schroot 0.1.2\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2006-02-20 12:07+0000\n"
-"PO-Revision-Date: 2006-02-20 12:07+0000\n"
+"POT-Creation-Date: 2006-02-21 00:35+0000\n"
+"PO-Revision-Date: 2006-02-21 00:36+0000\n"
 "Last-Translator: Roger Leigh <rleigh@debian.org>\n"
 "Language-Team: English <rleigh@debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -215,6 +215,10 @@ msgstr "%1%: security failure: %2%"
 msgid "%1%: lock discard failure: %2%"
 msgstr "%1%: lock discard failure: %2%"
 
+#: schroot/sbuild-chroot-config.cc:474
+msgid " (snapshot source device)"
+msgstr " (snapshot source device)"
+
 #: schroot/sbuild-chroot-file.cc:108
 msgid "File"
 msgstr "File"
diff --git a/po/sv.po b/po/sv.po
index 0db2c465..9508ee71 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: schroot 0.2.0\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2006-02-20 12:07+0000\n"
+"POT-Creation-Date: 2006-02-21 00:35+0000\n"
 "PO-Revision-Date: 2006-02-18 11:52+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -218,6 +218,11 @@ msgstr "%1%: säkerhetsfel: %2%"
 msgid "%1%: lock discard failure: %2%"
 msgstr "%1%: fel vid kassering av lås: %2%"
 
+#: schroot/sbuild-chroot-config.cc:474
+#, fuzzy
+msgid " (snapshot source device)"
+msgstr "Enhet för LVM-snapshot"
+
 #: schroot/sbuild-chroot-file.cc:108
 msgid "File"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index d38b26ba..5c553f33 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: schroot-0.2.0\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2006-02-20 12:07+0000\n"
+"POT-Creation-Date: 2006-02-21 00:35+0000\n"
 "PO-Revision-Date: 2006-02-07 22:26+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -218,6 +218,11 @@ msgstr "%1%: bảo mật bị lỗi: %2%"
 msgid "%1%: lock discard failure: %2%"
 msgstr "%1%: việc vứt bỏ khoá bị lỗi: %2%"
 
+#: schroot/sbuild-chroot-config.cc:474
+#, fuzzy
+msgid " (snapshot source device)"
+msgstr "Thiết bị hiện trạng Bộ Quản lý Khối tin Hợp lý"
+
 #: schroot/sbuild-chroot-file.cc:108
 msgid "File"
 msgstr ""
diff --git a/schroot/sbuild-chroot-config.cc b/schroot/sbuild-chroot-config.cc
index 1bdfbc80..9fe07872 100644
--- a/schroot/sbuild-chroot-config.cc
+++ b/schroot/sbuild-chroot-config.cc
@@ -462,6 +462,26 @@ chroot_config::parse_data (std::istream& stream,
       kconfig >> chroot;
 
       add(chroot);
+
+      if (type == "lvm-snapshot")
+	{
+	  chroot::ptr source_chroot
+	    (new chroot_block_device
+	     (*dynamic_cast<chroot_lvm_snapshot *>(chroot.get())));
+	  source_chroot->set_name(source_chroot->get_name() + "-source");
+	  source_chroot->set_description
+	    (source_chroot->get_description() +
+	     _(" (snapshot source device)"));
+
+	  string_list const& aliases = source_chroot->get_aliases();
+	  string_list source_aliases;
+	  for (string_list::const_iterator alias = aliases.begin();
+	       alias != aliases.end();
+	       ++alias)
+	    source_aliases.push_back(*alias + "-source");
+	  source_chroot->set_aliases(source_aliases);
+	  add(source_chroot);
+	}
     }
 }
 
diff --git a/schroot/schroot.conf.5.in b/schroot/schroot.conf.5.in
index 6894e64c..0593bb6d 100644
--- a/schroot/schroot.conf.5.in
+++ b/schroot/schroot.conf.5.in
@@ -128,7 +128,12 @@ LVM snapshot chroots
 Chroots of type \[lq]lvm\-snapshot\[rq] are a filesystem available on an LVM
 logical volume (LV).  A snapshot LV will be created from this LV on demand, and
 then the snapshot will be mounted.  At the end of the session, the snapshot LV
-will be unmounted and removed.  All of the options for \[lq]block\-device\[rq]
+will be unmounted and removed.  For each chroot of this type, a corresponding
+\[lq]block\-device\[rq] chroot will be created, with a \fI\-source\fP suffix
+appended to the chroot name and all its aliases; this is for convenient access
+to the source device.
+.PP
+All of the options for \[lq]block\-device\[rq]
 are available, plus an additional option:
 .TP
 .B lvm-snapshot-options=\fIsnapshot_options\fP
@@ -138,6 +143,7 @@ example, \[lq]\-L 2g\[rq] to create a snapshot 2 GiB in size.
 the LV name (\[lq]\-n\[rq]), the snapshot option (\[lq]\-s\[rq]) and the
 original LV path may not be specfied here; they are set automatically by
 schroot.
+.PP
 .SS Localisation
 .PP
 Some keys make be localised in multiple lanuages.  This is achieved by adding