From a85f06952defd341f45a53a3cdfeef66d4003de0 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Mon, 30 Apr 2018 09:42:11 -0400
Subject: [PATCH] man/ostree-init: Briefly describe various modes

Closes: #1561

Closes: #1560
Approved by: cgwalters
---
 man/ostree-init.xml          | 25 ++++++++++++++++++-------
 src/ostree/ot-builtin-init.c |  2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/man/ostree-init.xml b/man/ostree-init.xml
index b74648db..b2726321 100644
--- a/man/ostree-init.xml
+++ b/man/ostree-init.xml
@@ -69,13 +69,24 @@ Boston, MA 02111-1307, USA.
         <variablelist>
             <varlistentry>
                 <term><option>--mode</option>="MODE"</term>
-                <listitem><para> Initialize repository in given mode
-                (<literal>bare</literal>, <literal>bare-user</literal>,
-                <literal>archive</literal>). The default is
-                <literal>bare</literal>. Note that for
-                <literal>archive</literal> the repository configuration file
-                will actually have <literal>archive-z2</literal>, as that's the
-                historical name.</para></listitem>
+                <listitem><para>
+                    Initialize repository in given mode
+                    (<literal>bare</literal>, <literal>bare-user</literal>,
+                    <literal>bare-user-only</literal>, <literal>archive</literal>).
+                    The default is <literal>bare</literal>. Note that for
+                    <literal>archive</literal> the repository configuration file
+                    will actually have <literal>archive-z2</literal>, as that's
+                    the historical name.</para>
+
+                    <para>See the manual for differences between these modes.
+                    Briefly, <literal>bare</literal> mode stores files as they
+                    are, so they can be directly hardlinked,
+                    <literal>bare-user</literal> uses extended attributes to
+                    store ownership and xattr information, allowing non-root
+                    operations, <literal>bare-user-only</literal> does not store
+                    ownership information, and <literal>archive</literal> stores
+                    files compressed, to be served over the network.
+                </para></listitem>
             </varlistentry>
 
             <varlistentry>
diff --git a/src/ostree/ot-builtin-init.c b/src/ostree/ot-builtin-init.c
index ae0d0cc6..a4fb5c51 100644
--- a/src/ostree/ot-builtin-init.c
+++ b/src/ostree/ot-builtin-init.c
@@ -38,7 +38,7 @@ static char *opt_collection_id = NULL;
  */
 
 static GOptionEntry options[] = {
-  { "mode", 0, 0, G_OPTION_ARG_STRING, &opt_mode, "Initialize repository in given mode (bare, archive)", NULL },
+  { "mode", 0, 0, G_OPTION_ARG_STRING, &opt_mode, "Initialize repository in given mode (bare, bare-user, bare-user-only, archive)", NULL },
 #ifdef OSTREE_ENABLE_EXPERIMENTAL_API
   { "collection-id", 0, 0, G_OPTION_ARG_STRING, &opt_collection_id,
     "Globally unique ID for this repository as an collection of refs for redistribution to other repositories", "COLLECTION-ID" },