diff options
| author | Roger Leigh <rleigh@debian.org> | 2005-10-30 23:13:28 +0000 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2005-10-30 23:13:28 +0000 |
| commit | 90fca14b127c50df9a7f87fb9100066e3c7daa2e (patch) | |
| tree | f61a4daba612f4e2d004769cf6bbc9745c08e9ac /doc | |
| parent | bd45085c5440229ca5c0eb1c75a9e551b9ffd3c5 (diff) | |
| download | schroot-90fca14b127c50df9a7f87fb9100066e3c7daa2e.tar.gz | |
* 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.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/schroot/tmpl/sbuild-chroot.sgml | 1 | ||||
| -rw-r--r-- | doc/schroot/tmpl/sbuild-session.sgml | 5 |
2 files changed, 4 insertions, 2 deletions
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 </para> @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 <!-- ##### MACRO SBUILD_SESSION_ERROR ##### --> <para> |