* Version 0.1.6.release/schroot-0.1.6

* debian/changelog: Update
* TODO: Update.
* NEWS: Update.
* schroot/schroot.1.in: Remove unused session options.
* schroot/schroot.c: Disable unused session options.

6 files changed, 31 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index e12952e9..3606e77a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-10-13  Roger Leigh  <rleigh@debian.org>
+
+	* Version 0.1.6.
+
+	* debian/changelog: Update
+
+	* TODO: Update.
+
+	* NEWS: Update.
+
+	* schroot/schroot.1.in: Remove unused session options.
+
+	* schroot/schroot.c: Disable unused session options.
+
 2005-10-12  Roger Leigh  <rleigh@debian.org>
 
 	* All manpages updated to document the new names and directory
diff --git a/NEWS b/NEWS
index 86c4b4cf..f6a09bc2 100644
--- a/NEWS
+++ b/NEWS
@@ -6,15 +6,17 @@ building and configuration.
 
 * Major changes in 0.1.6:
 
-  1) Setup scripts may be run on startup and shutdown in order to
-     perform setup tasks such as configuring the chroot and mounting
-     filesystems.  These are stored in /etc/schroot/setup.d, and run
+  1) Setup scripts may be run on startup and shutdown and before and
+     after a command in order to perform setup tasks such as
+     configuring the chroot and mounting filesystems.  These are
+     stored in /etc/schroot/setup.d and /etc/schroot/run.d, and run
      using run-parts(8).  New scripts may easily be added by the
-     system administrator.
+     system administrator.  See schroot-setup(5).
 
   2) Different types of chroots are now supported.  The current types
      are "plain" (the default, which is the type supported by previous
-     releases) and "block-device", a block device mounted on the fly.
+     releases), "block-device" (a block device mounted on the fly) and
+     "lvm-snapshot" (and LVM snapshot of an LV made on the fly).
 
 * Major changes in 0.1.5:
 
diff --git a/TODO b/TODO
index 176b54e3..a77ed2e3 100644
--- a/TODO
+++ b/TODO
@@ -14,6 +14,9 @@ TODO
 
 * Document the setup and session scripts.
 
+* Add examples of new chroot types to schroot.conf, using all
+  available options.
+
 * Make "session" naming more consistent.
 
 * chroot access should be restricted to a certain number of
diff --git a/debian/changelog b/debian/changelog
index 45c2ad82..1fb4d684 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,7 @@ schroot (0.1.6-1) unstable; urgency=low
     replace with the package version.
   * debian/rules: Set $localstatedir when running configure.
 
- -- Roger Leigh <rleigh@debian.org>  Wed,  5 Oct 2005 19:33:17 +0100
+ -- Roger Leigh <rleigh@debian.org>  Thu, 13 Oct 2005 00:16:06 +0100
 
 schroot (0.1.5-1) unstable; urgency=low
 
diff --git a/schroot/schroot.1.in b/schroot/schroot.1.in
index 0bd8e1ef..5352a9ec 100644
--- a/schroot/schroot.1.in
+++ b/schroot/schroot.1.in
@@ -36,12 +36,6 @@ PAM configuration).  All chroot usage will be logged in the system logs.
 .B \-?, \-\-help
 Show help summary.
 .TP
-.B \-\-help\-all
-Show all help, including advanced options.
-.TP
-.B \-\-help\-session
-Show session options.
-.TP
 .B \-a, \-\-all
 Use all chroots.  When a command has been specified, the command will be run in
 all chroots.  If \fB\-\-info\fP has been used, display information about all
@@ -75,23 +69,6 @@ Print all messages.
 .TP
 .B \-V, \-\-version
 Print version information.
-.SS Session options
-.TP
-.B \-b, \-\-begin\-session
-Begin a session.  A unique session identifier (UUID) is returned on standard
-output.  The UUID is required to use the other session options.
-.TP
-.B \-r, \-\-run\-session=\fIUUID\fP
-Run an existing session.
-.TP
-.B \-e, \-\-end\-session=\fIUUID\fP
-End an existing session.
-.TP
-.B \-f, \-\-force
-Force a session operation, even if it would otherwise fail.  This may be used
-to forcibly end a session, even if it has active users.  This does not
-guarantee that the session will be ended cleanly; filesystems may not be
-unmounted, for example.
 .SH EXAMPLES
 \f[CR]$ \f[CB]schroot \-l\fP\fP
 .br
diff --git a/schroot/schroot.c b/schroot/schroot.c
index c9540008..fd230908 100644
--- a/schroot/schroot.c
+++ b/schroot/schroot.c
@@ -143,12 +143,12 @@ parse_options(int   argc,
   GOptionContext *context = g_option_context_new (_("- run command or shell in a chroot"));
   g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
 
-  GOptionGroup* session_group =
-    g_option_group_new("session", N_("Session Options"),
-		       N_("Session management options"), NULL, NULL);
-  g_option_group_set_translation_domain(session_group, GETTEXT_PACKAGE);
-  g_option_group_add_entries (session_group, session_entries);
-  g_option_context_add_group(context, session_group);
+/*   GOptionGroup* session_group = */
+/*     g_option_group_new("session", N_("Session Options"), */
+/* 		       N_("Session management options"), NULL, NULL); */
+/*   g_option_group_set_translation_domain(session_group, GETTEXT_PACKAGE); */
+/*   g_option_group_add_entries (session_group, session_entries); */
+/*   g_option_context_add_group(context, session_group); */
 
   g_option_context_parse (context, &argc, &argv, &error);
   g_option_context_free (context);