shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-28 02:50:16 +03:00
Code

machinectl: add -P

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2024-03-02 12:25:22 +01:00
parent 31e70e88cd
commit c5c619502b
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
man/machinectl.xml
View File

@ -553,6 +553,17 @@
<xi:include href="version-info.xml" xpointer="v206"/></listitem>
</varlistentry>
<varlistentry>
<term><option>--value</option></term>
<listitem><para>When printing properties with <command>show</command>, only print the value,
and skip the property name and <literal>=</literal>.</para>
<xi:include href="version-info.xml" xpointer="v230"/></listitem>
</varlistentry>
<xi:include href="timedatectl.xml" xpointer="option-P"/>
<varlistentry>
<term><option>-a</option></term>
<term><option>--all</option></term>
@ -570,15 +581,6 @@
<xi:include href="version-info.xml" xpointer="v206"/></listitem>
</varlistentry>
<varlistentry>
<term><option>--value</option></term>
<listitem><para>When printing properties with <command>show</command>, only print the value,
and skip the property name and <literal>=</literal>.</para>
<xi:include href="version-info.xml" xpointer="v230"/></listitem>
</varlistentry>
<varlistentry>
<term><option>-l</option></term>
<term><option>--full</option></term>

2
man/timedatectl.xml
View File

@ -273,7 +273,7 @@
<xi:include href="version-info.xml" xpointer="v239"/></listitem>
</varlistentry>
<varlistentry>
<varlistentry id='option-P'>
<term><option>-P</option></term>
<listitem>

23
src/machine/machinectl.c
View File

@ -2058,9 +2058,10 @@ static int help(int argc, char *argv[], void *userdata) {
" -H --host=[USER@]HOST Operate on remote host\n"
" -M --machine=CONTAINER Operate on local container\n"
" -p --property=NAME Show only properties by this name\n"
" --value When showing properties, only print the value\n"
" -P NAME Equivalent to --value --property=NAME\n"
" -q --quiet Suppress output\n"
" -a --all Show all properties, including empty ones\n"
" --value When showing properties, only print the value\n"
" -l --full Do not ellipsize output\n"
" --kill-whom=WHOM Whom to send signal to\n"
" -s --signal=SIGNAL Which signal to send\n"
@ -2115,8 +2116,8 @@ static int parse_argv(int argc, char *argv[]) {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, ARG_VERSION },
{ "property", required_argument, NULL, 'p' },
{ "all", no_argument, NULL, 'a' },
{ "value", no_argument, NULL, ARG_VALUE },
{ "all", no_argument, NULL, 'a' },
{ "full", no_argument, NULL, 'l' },
{ "no-pager", no_argument, NULL, ARG_NO_PAGER },
{ "no-legend", no_argument, NULL, ARG_NO_LEGEND },
@ -2152,7 +2153,7 @@ static int parse_argv(int argc, char *argv[]) {
optind = 0;
for (;;) {
static const char option_string[] = "-hp:als:H:M:qn:o:E:V";
static const char option_string[] = "-hp:P:als:H:M:qn:o:E:V";
c = getopt_long(argc, argv, option_string + reorder, options, NULL);
if (c < 0)
@ -2213,14 +2214,20 @@ static int parse_argv(int argc, char *argv[]) {
return version();
case 'p':
case 'P':
r = strv_extend(&arg_property, optarg);
if (r < 0)
return log_oom();
/* If the user asked for a particular
* property, show it to them, even if it is
* empty. */
/* If the user asked for a particular property, show it to them, even if empty. */
SET_FLAG(arg_print_flags, BUS_PRINT_PROPERTY_SHOW_EMPTY, true);
if (c == 'p')
break;
_fallthrough_;
case ARG_VALUE:
SET_FLAG(arg_print_flags, BUS_PRINT_PROPERTY_ONLY_VALUE, true);
break;
case 'a':
@ -2228,10 +2235,6 @@ static int parse_argv(int argc, char *argv[]) {
arg_all = true;
break;
case ARG_VALUE:
SET_FLAG(arg_print_flags, BUS_PRINT_PROPERTY_ONLY_VALUE, true);
break;
case 'l':
arg_full = true;
break;