* schroot/sbuild-chroot-lvm-snapshot.c

  (sbuild_chroot_lvm_snapshot_setup_lock): The device lock is held
  on the source device during snapshotting (setup start), and on the
  snapshot device from run start to run stop and then during setup
  stop while the chroot is destroyed.
* schroot/sbuild-chroot-block-device.c
  (sbuild_chroot_block_device_setup_lock): The device lock is held
  throughout the entire session.  It is acquired at setup start and
  released at setup stop.  This uses the new sbuild-lock device
  locking primitives.
* schroot/sbuild-chroot.h: SbuildChrootSetupLockFunc uses a
  mutable chroot object.  All implementations of the setup_lock
  vfunc have been changed accordingly.
* schroot/sbuild-lock.c
  (sbuild_lock_set_device_lock): New function.  Lock a device using
  liblockdev.
  (sbuild_lock_unset_device_lock): New function.  Unlock a device
  using liblockdev.

3 files changed, 26 insertions, 2 deletions

diff --git a/doc/schroot/schroot-sections.txt b/doc/schroot/schroot-sections.txt
index 45ddd4d6..840839ad 100644
--- a/doc/schroot/schroot-sections.txt
+++ b/doc/schroot/schroot-sections.txt
@@ -315,6 +315,8 @@ SbuildLockError
 SbuildLockType
 sbuild_lock_set_lock
 sbuild_lock_unset_lock
+sbuild_lock_set_device_lock
+sbuild_lock_unset_device_lock
 <SUBSECTION Standard>
 SBUILD_TYPE_LOCK_ERROR
 sbuild_lock_error_get_type
diff --git a/doc/schroot/tmpl/sbuild-chroot.sgml b/doc/schroot/tmpl/sbuild-chroot.sgml
index 62f6392b..64be7d57 100644
--- a/doc/schroot/tmpl/sbuild-chroot.sgml
+++ b/doc/schroot/tmpl/sbuild-chroot.sgml
@@ -96,9 +96,9 @@ SbuildChroot class.
 @parent: the parent class
 @print_details: vfunc to print additional chroot details
 @print_config: vfunc to print the config file group for this chroot
-@setup_env: 
+@setup_env: vfunc to set the environment that the setup scripts will see during execution
 @get_chroot_type: vfunc to get the user visible chroot type name
-@setup_lock: 
+@setup_lock: vfunc to lock a chroot during setup
 @get_session_flags: vfunc to get the session flags for this chroot type
 
 <!-- ##### USER_FUNCTION SbuildChrootPrintDetailsFunc ##### -->
diff --git a/doc/schroot/tmpl/sbuild-lock.sgml b/doc/schroot/tmpl/sbuild-lock.sgml
index 67a16f97..8c506b5d 100644
--- a/doc/schroot/tmpl/sbuild-lock.sgml
+++ b/doc/schroot/tmpl/sbuild-lock.sgml
@@ -69,3 +69,25 @@ lock acquisition will fail.
 @Returns: 
 
 
+<!-- ##### FUNCTION sbuild_lock_set_device_lock ##### -->
+<para>
+
+</para>
+
+@device: 
+@lock_type: 
+@timeout: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION sbuild_lock_unset_device_lock ##### -->
+<para>
+
+</para>
+
+@device: 
+@error: 
+@Returns: 
+
+