From 90fca14b127c50df9a7f87fb9100066e3c7daa2e Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Sun, 30 Oct 2005 23:13:28 +0000 Subject: * schroot/schroot.1.in: Document --recover-session. * schroot/setup/*: Add support to setup scripts for "setup-recover" option. In particular, filesystems are all remounted, and all "setup-start" tasks are performed, except for snapshotting. * schroot/schroot.c (parse_options): Add "--recover-session" session option. (parse_session_options): Parse "--recover-session". (main): Update configuration file loading to account for recovery. * schroot/sbuild-session.c (sbuild_session_setup_chroot): Add support for "setup-recover" argument in scripts. (sbuild_session_run): Add support for session recovery option. * schroot/sbuild-session.h (SbuildSessionOperation): Add SBUILD_SESSION_OPERATION_RECOVER. * schroot/sbuild-chroot.h (SbuildChrootSetupType): Add SBUILD_CHROOT_SETUP_RECOVER. --- doc/schroot/tmpl/sbuild-chroot.sgml | 1 + doc/schroot/tmpl/sbuild-session.sgml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/schroot/tmpl/sbuild-chroot.sgml b/doc/schroot/tmpl/sbuild-chroot.sgml index b5244761..000b77b0 100644 --- a/doc/schroot/tmpl/sbuild-chroot.sgml +++ b/doc/schroot/tmpl/sbuild-chroot.sgml @@ -175,6 +175,7 @@ The type of chroot setup operation @SBUILD_CHROOT_SETUP_START: Set up a new chroot, preparing it for use +@SBUILD_CHROOT_SETUP_RECOVER: Recover an existing, but inactive, chroot @SBUILD_CHROOT_SETUP_STOP: Clean up an existing chroot, possibly deleting it @SBUILD_CHROOT_RUN_START: Start running a command in an existing chroot @SBUILD_CHROOT_RUN_STOP: Stop running a command in an existing chroot diff --git a/doc/schroot/tmpl/sbuild-session.sgml b/doc/schroot/tmpl/sbuild-session.sgml index bcba47a9..61956ed5 100644 --- a/doc/schroot/tmpl/sbuild-session.sgml +++ b/doc/schroot/tmpl/sbuild-session.sgml @@ -77,8 +77,9 @@ The operation to perform when the session is run. @SBUILD_SESSION_OPERATION_AUTOMATIC: Create, run and end the session automatically @SBUILD_SESSION_OPERATION_BEGIN: Create a session and return the session id -@SBUILD_SESSION_OPERATION_END: End a session using the current session id -@SBUILD_SESSION_OPERATION_RUN: Run a session using the current session id +@SBUILD_SESSION_OPERATION_RECOVER: Recover a session +@SBUILD_SESSION_OPERATION_END: End a session +@SBUILD_SESSION_OPERATION_RUN: Run a session -- cgit v1.2.3