[systemd-commits] 2 commits - Makefile-man.am man/busctl.xml man/coredumpctl.xml man/loginctl.xml man/machinectl.xml man/networkctl.xml man/standard-options.xml man/systemctl.xml src/network
Zbigniew Jędrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Mon Jan 19 18:45:17 PST 2015
Makefile-man.am | 2
man/busctl.xml | 13 ---
man/coredumpctl.xml | 2
man/loginctl.xml | 13 ---
man/machinectl.xml | 11 --
man/networkctl.xml | 175 +++++++++++++++++++++++++++++++++++++++++++++++
man/standard-options.xml | 9 ++
man/systemctl.xml | 12 ---
src/network/networkctl.c | 2
9 files changed, 196 insertions(+), 43 deletions(-)
New commits:
commit d9000fd3b3ad0728832007f56e9cafacfbbe54e7
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Mon Jan 19 21:44:16 2015 -0500
man: add networkctl(1)
diff --git a/Makefile-man.am b/Makefile-man.am
index b2869c4..105853e 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -22,6 +22,7 @@ MANPAGES += \
man/localtime.5 \
man/machine-id.5 \
man/machine-info.5 \
+ man/networkctl.1 \
man/os-release.5 \
man/sd-daemon.3 \
man/sd-id128.3 \
@@ -1642,6 +1643,7 @@ EXTRA_DIST += \
man/machine-info.xml \
man/machinectl.xml \
man/modules-load.d.xml \
+ man/networkctl.xml \
man/nss-myhostname.xml \
man/nss-mymachines.xml \
man/os-release.xml \
diff --git a/man/networkctl.xml b/man/networkctl.xml
new file mode 100644
index 0000000..c393090
--- /dev/null
+++ b/man/networkctl.xml
@@ -0,0 +1,175 @@
+<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+This file is part of systemd.
+
+Copyright 2015 Zbigniew Jędrzejewski-Szmek
+
+systemd is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+systemd is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="networkctl"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <refentryinfo>
+ <title>networkctl</title>
+ <productname>systemd</productname>
+
+ <authorgroup>
+ <author>
+ <contrib>Documentation</contrib>
+ <firstname>Zbigniew</firstname>
+ <surname>Jędrzejewski-Szmek</surname>
+ <email>zbyszek at in.waw.pl</email>
+ </author>
+ </authorgroup>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>networkctl</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>networkctl</refname>
+ <refpurpose>Query the statuc of network links</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>networkctl</command>
+ <arg choice="opt" rep="repeat">OPTIONS</arg>
+ <arg choice="plain">COMMAND</arg>
+ <arg choice="opt" rep="repeat">LINK</arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>Description</title>
+
+ <para><command>networkctl</command> may be used to introspect the
+ state of the network links as seen by
+ <command>systemd-networkd</command>. Please refer to
+ <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ for an introduction to the the basic concepts, functionality, and
+ configuration syntax.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>Options</title>
+
+ <para>The following options are understood:</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>
+ <option>-a</option>
+ <option>--all</option>
+ </term>
+
+ <listitem>
+ <para>Show all links with <command>status</command>.</para>
+ </listitem>
+ </varlistentry>
+
+ <xi:include href="standard-options.xml" xpointer="help" />
+ <xi:include href="standard-options.xml" xpointer="version" />
+ <xi:include href="standard-options.xml" xpointer="no-pager" />
+
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>Commands</title>
+
+ <para>The following commands are understood:</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>
+ <command>list</command>
+ </term>
+
+ <listitem>
+ <para>Show a list of existing links and their
+ status. Produces output similar to <programlisting>
+IDX LINK TYPE OPERATIONAL SETUP
+ 1 lo loopback carrier unmanaged
+ 2 eth0 ether routable configured
+ 3 virbr0 ether no-carrier unmanaged
+ 4 virbr0-nic ether off unmanaged
+
+4 links listed.</programlisting></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <command>status</command>
+ <optional><replaceable>LINK...</replaceable></optional>
+ </term>
+
+ <listitem>
+ <para>Show information about the specified links: type,
+ state, kernel module driver, hardware and IP address,
+ configured DNS servers, etc.</para>
+
+ <para>When no links are specified, routable links are
+ shown. See also option <option>--all</option>.</para>
+
+ <para>Produces output similar to
+ <programlisting>
+● State: routable
+ Address: 10.193.76.5 on eth0
+ 192.168.122.1 on virbr0
+ 169.254.190.105 on eth0
+ fe80::5054:aa:bbbb:cccc on eth0
+ Gateway: 10.193.11.1 (CISCO SYSTEMS, INC.) on eth0
+ DNS: 8.8.8.8
+ 8.8.4.4</programlisting></para>
+ </listitem>
+
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <command>lldp</command>
+ </term>
+
+ <listitem>
+ <para>Show LLDP (Link Layer Discovery Protocol)
+ status.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>Exit status</title>
+
+ <para>On success, 0 is returned, a non-zero failure
+ code otherwise.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>See Also</title>
+ <para>
+ <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ </para>
+ </refsect1>
+</refentry>
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index f7e300b..aa83f32 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -1018,7 +1018,7 @@ static void help(void) {
" -a --all Show status for all links\n\n"
"Commands:\n"
" list List links\n"
- " status LINK Show link status\n"
+ " status [LINK...] Show link status\n"
" lldp Show lldp information\n"
, program_invocation_short_name);
}
commit 12f15e596a3040f32bb8c9aa9d0bf9b43fc96567
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Mon Jan 19 21:43:35 2015 -0500
man: use one description of --no-legend
diff --git a/man/busctl.xml b/man/busctl.xml
index c8a087c..afc33c7 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -124,16 +124,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
</varlistentry>
<varlistentry>
- <term><option>--no-legend</option></term>
-
- <listitem>
- <para>Do not print the legend,
- i.e. the column headers and the
- footer.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--size=</option></term>
<listitem>
@@ -251,9 +241,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<xi:include href="user-system-options.xml" xpointer="host" />
<xi:include href="user-system-options.xml" xpointer="machine" />
+ <xi:include href="standard-options.xml" xpointer="no-pager" />
+ <xi:include href="standard-options.xml" xpointer="no-legend" />
<xi:include href="standard-options.xml" xpointer="help" />
<xi:include href="standard-options.xml" xpointer="version" />
- <xi:include href="standard-options.xml" xpointer="no-pager" />
</variablelist>
</refsect1>
diff --git a/man/coredumpctl.xml b/man/coredumpctl.xml
index ed84621..929af19 100644
--- a/man/coredumpctl.xml
+++ b/man/coredumpctl.xml
@@ -74,7 +74,7 @@
<varlistentry>
<term><option>--no-legend</option></term>
- <listitem><para>Do not print the column headers.
+ <listitem><para>Do not print column headers.
</para></listitem>
</varlistentry>
diff --git a/man/loginctl.xml b/man/loginctl.xml
index 5dd64e7..11ed0ee 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -73,16 +73,6 @@
<variablelist>
<varlistentry>
- <term><option>--no-legend</option></term>
-
- <listitem>
- <para>Do not print the legend,
- i.e. the column headers and
- the footer.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--no-ask-password</option></term>
<listitem><para>Do not query the user
@@ -189,9 +179,10 @@
<xi:include href="user-system-options.xml" xpointer="host" />
<xi:include href="user-system-options.xml" xpointer="machine" />
+ <xi:include href="standard-options.xml" xpointer="no-pager" />
+ <xi:include href="standard-options.xml" xpointer="no-legend" />
<xi:include href="standard-options.xml" xpointer="help" />
<xi:include href="standard-options.xml" xpointer="version" />
- <xi:include href="standard-options.xml" xpointer="no-pager" />
</variablelist>
</refsect1>
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 1953186..ff447b6 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -151,14 +151,6 @@
</varlistentry>
<varlistentry>
- <term><option>--no-legend</option></term>
-
- <listitem><para>Do not print the legend,
- i.e. the column headers and the
- footer.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--mkdir</option></term>
<listitem><para>When used with
@@ -208,9 +200,10 @@
<xi:include href="user-system-options.xml" xpointer="host" />
<xi:include href="user-system-options.xml" xpointer="machine" />
+ <xi:include href="standard-options.xml" xpointer="no-pager" />
+ <xi:include href="standard-options.xml" xpointer="no-legend" />
<xi:include href="standard-options.xml" xpointer="help" />
<xi:include href="standard-options.xml" xpointer="version" />
- <xi:include href="standard-options.xml" xpointer="no-pager" />
</variablelist>
</refsect1>
diff --git a/man/standard-options.xml b/man/standard-options.xml
index ec9146d..f214463 100644
--- a/man/standard-options.xml
+++ b/man/standard-options.xml
@@ -27,4 +27,13 @@
<para>Do not pipe output into a pager.</para>
</listitem>
</varlistentry>
+
+ <varlistentry id='no-legend'>
+ <term><option>--no-legend</option></term>
+
+ <listitem>
+ <para>Do not print the legend, i.e. column headers and the
+ footer with hints.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 38c2bbf..1c738ce 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -321,15 +321,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
</listitem>
</varlistentry>
- <varlistentry>
- <term><option>--no-legend</option></term>
-
- <listitem>
- <para>Do not print the legend, i.e. the column headers and
- the footer with hints.</para>
- </listitem>
- </varlistentry>
-
<xi:include href="user-system-options.xml" xpointer="user" />
<xi:include href="user-system-options.xml" xpointer="system" />
@@ -547,9 +538,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<xi:include href="user-system-options.xml" xpointer="host" />
<xi:include href="user-system-options.xml" xpointer="machine" />
+ <xi:include href="standard-options.xml" xpointer="no-pager" />
+ <xi:include href="standard-options.xml" xpointer="no-legend" />
<xi:include href="standard-options.xml" xpointer="help" />
<xi:include href="standard-options.xml" xpointer="version" />
- <xi:include href="standard-options.xml" xpointer="no-pager" />
</variablelist>
</refsect1>
More information about the systemd-commits
mailing list