diff options
| author | Roger Leigh <rleigh@debian.org> | 2009-12-13 22:32:06 +0000 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2009-12-13 22:32:06 +0000 |
| commit | 3775225ff516fdb2c2c2af5d75da7d71d049bcbc (patch) | |
| tree | 514fef21046f86c743aee249d767606778b1f351 /sbuild | |
| parent | 5e9a520df47be4dee9533b1a233b2919055c171d (diff) | |
| download | schroot-3775225ff516fdb2c2c2af5d75da7d71d049bcbc.tar.gz | |
sbuild::chroot: Remove obsolete EXEC_START and EXEC_STOP
Diffstat (limited to 'sbuild')
| -rw-r--r-- | sbuild/sbuild-chroot-block-device.cc | 4 | ||||
| -rw-r--r-- | sbuild/sbuild-chroot-lvm-snapshot.cc | 5 | ||||
| -rw-r--r-- | sbuild/sbuild-chroot.h | 4 |
3 files changed, 1 insertions, 12 deletions
diff --git a/sbuild/sbuild-chroot-block-device.cc b/sbuild/sbuild-chroot-block-device.cc index 680131a6..fa8bbbe6 100644 --- a/sbuild/sbuild-chroot-block-device.cc +++ b/sbuild/sbuild-chroot-block-device.cc @@ -116,10 +116,6 @@ chroot_block_device::setup_lock (chroot::setup_type type, bool lock, int status) { - /* Only lock during setup, not exec. */ - if (type == EXEC_START || type == EXEC_STOP) - return; - /* Lock is preserved through the entire session. */ if ((type == SETUP_START && lock == false) || (type == SETUP_STOP && lock == true)) diff --git a/sbuild/sbuild-chroot-lvm-snapshot.cc b/sbuild/sbuild-chroot-lvm-snapshot.cc index 15455054..f63c9248 100644 --- a/sbuild/sbuild-chroot-lvm-snapshot.cc +++ b/sbuild/sbuild-chroot-lvm-snapshot.cc @@ -167,11 +167,6 @@ chroot_lvm_snapshot::setup_lock (chroot::setup_type type, } else { - /* Lock is preserved while running a command. */ - if ((type == EXEC_START && lock == false) || - (type == EXEC_STOP && lock == true)) - return; - sbuild::device_lock dlock(device); if (lock) { diff --git a/sbuild/sbuild-chroot.h b/sbuild/sbuild-chroot.h index aaddf1f7..ca6fc857 100644 --- a/sbuild/sbuild-chroot.h +++ b/sbuild/sbuild-chroot.h @@ -50,9 +50,7 @@ namespace sbuild { SETUP_START, ///< Activate a chroot. SETUP_RECOVER, ///< Reactivate a chroot. - SETUP_STOP, ///< Deactivate a chroot. - EXEC_START, ///< Start executing a command in an active chroot. - EXEC_STOP ///< End executing a command in an active chroot. + SETUP_STOP ///< Deactivate a chroot. }; /// Chroot session properties |