packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

admin: Fix list of subcommands in help and manpage 

This adds subcommands that were missing from the ostree-admin man page,
and makes cosmetic fixes there and in the --help output to ensure
alphabetical order and remove trailing whitespace.

Closes: #1621
Approved by: jlebon
This commit is contained in:
Matthew Leeds 2018-06-11 19:09:28 -07:00 committed by Atomic Bot
parent ecdebeb20e
commit c767f7b739
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
man/ostree-admin.xml
View File

@ -73,11 +73,13 @@ Boston, MA 02111-1307, USA.
<listitem><para><command>init-fs</command></para></listitem> <listitem><para><command>init-fs</command></para></listitem>
<listitem><para><command>instutil</command></para></listitem> <listitem><para><command>instutil</command></para></listitem>
<listitem><para><command>os-init</command></para></listitem> <listitem><para><command>os-init</command></para></listitem>
<listitem><para><command>status</command></para></listitem> <listitem><para><command>pin</command></para></listitem>
<listitem><para><command>set-origin</command></para></listitem> <listitem><para><command>set-origin</command></para></listitem>
<listitem><para><command>status</command></para></listitem>
<listitem><para><command>switch</command></para></listitem> <listitem><para><command>switch</command></para></listitem>
<listitem><para><command>undeploy</command></para></listitem> <listitem><para><command>undeploy</command></para></listitem>
<listitem><para><command>upgrade</command></para></listitem> <listitem><para><command>unlock</command></para></listitem>
<listitem><para><command>upgrade</command></para></listitem>
</itemizedlist> </itemizedlist>
<para> <para>

12
src/ostree/ot-builtin-admin.c
View File

@ -42,6 +42,9 @@ static OstreeCommand admin_subcommands[] = {
{ "deploy", OSTREE_BUILTIN_FLAG_NO_REPO, { "deploy", OSTREE_BUILTIN_FLAG_NO_REPO,
ot_admin_builtin_deploy, ot_admin_builtin_deploy,
"Checkout revision REFSPEC as the new default deployment" }, "Checkout revision REFSPEC as the new default deployment" },
{ "finalize-staged", OSTREE_BUILTIN_FLAG_NO_REPO | OSTREE_BUILTIN_FLAG_HIDDEN,
ot_admin_builtin_finalize_staged,
"Internal command to run at shutdown time" },
{ "init-fs", OSTREE_BUILTIN_FLAG_NO_REPO, { "init-fs", OSTREE_BUILTIN_FLAG_NO_REPO,
ot_admin_builtin_init_fs, ot_admin_builtin_init_fs,
"Initialize a root filesystem" }, "Initialize a root filesystem" },
@ -51,15 +54,12 @@ static OstreeCommand admin_subcommands[] = {
{ "os-init", OSTREE_BUILTIN_FLAG_NO_REPO, { "os-init", OSTREE_BUILTIN_FLAG_NO_REPO,
ot_admin_builtin_os_init, ot_admin_builtin_os_init,
"Initialize empty state for given operating system" }, "Initialize empty state for given operating system" },
{ "set-origin", OSTREE_BUILTIN_FLAG_NO_REPO,
ot_admin_builtin_set_origin,
"Set Origin and create a new origin file" },
{ "pin", OSTREE_BUILTIN_FLAG_NO_REPO, { "pin", OSTREE_BUILTIN_FLAG_NO_REPO,
ot_admin_builtin_pin, ot_admin_builtin_pin,
"Change the \"pinning\" state of a deployment" }, "Change the \"pinning\" state of a deployment" },
{ "finalize-staged", OSTREE_BUILTIN_FLAG_NO_REPO | OSTREE_BUILTIN_FLAG_HIDDEN, { "set-origin", OSTREE_BUILTIN_FLAG_NO_REPO,
ot_admin_builtin_finalize_staged, ot_admin_builtin_set_origin,
"Internal command to run at shutdown time" }, "Set Origin and create a new origin file" },
{ "status", OSTREE_BUILTIN_FLAG_NO_REPO, { "status", OSTREE_BUILTIN_FLAG_NO_REPO,
ot_admin_builtin_status, ot_admin_builtin_status,
"List deployments" }, "List deployments" },