From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 27 Jun 2017 14:30:41 +0000 (-0400)
Subject: Add networkctl label to man and shell completion
X-Git-Tag: v234~80^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5be8dabd62543a018e8ab4c3b2cf810f15b6a92;p=platform%2Fupstream%2Fsystemd.git

Add networkctl label to man and shell completion
---

diff --git a/man/networkctl.xml b/man/networkctl.xml
index 809eb7e..d4fa5e9 100644
--- a/man/networkctl.xml
+++ b/man/networkctl.xml
@@ -172,14 +172,40 @@ s - Service VLAN, m - Two-port MAC Relay (TPMR)
 1 neighbors listed.</programlisting></para>
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>label</command>
+        </term>
+
+        <listitem><para>Show numerical address labels that can be used for address selection.
+        This is the same information that
+        <citerefentry><refentrytitle>ip-addrlabel</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+        shows. See <ulink url="https://tools.ietf.org/html/rfc3484">RFC 3484</ulink>
+        for a discussion of address labels.</para>
+
+        <para>Produces output similar to:
+        <programlisting>Prefix/Prefixlen                          Label
+        ::/0                                  1
+    fc00::/7                                  5
+    fec0::/10                                11
+    2002::/16                                 2
+    3ffe::/16                                12
+ 2001:10::/28                                 7
+    2001::/32                                 6
+::ffff:0.0.0.0/96                             4
+        ::/96                                 3
+       ::1/128                                0</programlisting></para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
   </refsect1>
 
   <refsect1>
     <title>Exit status</title>
 
-    <para>On success, 0 is returned, a non-zero failure
-    code otherwise.</para>
+    <para>On success, 0 is returned, a non-zero failure code otherwise.</para>
   </refsect1>
 
   <refsect1>
@@ -187,7 +213,8 @@ s - Service VLAN, m - Two-port MAC Relay (TPMR)
     <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>
+      <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry project='die-net'><refentrytitle>ip</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     </para>
   </refsect1>
 </refentry>
diff --git a/shell-completion/bash/networkctl b/shell-completion/bash/networkctl
index 942c7e1..68e3338 100644
--- a/shell-completion/bash/networkctl
+++ b/shell-completion/bash/networkctl
@@ -36,7 +36,7 @@ _networkctl() {
         )
 
         local -A VERBS=(
-                [STANDALONE]='list lldp'
+                [STANDALONE]='list lldp label'
                 [LINKS]='status'
         )
 
diff --git a/shell-completion/zsh/_networkctl b/shell-completion/zsh/_networkctl
index 61f173b..acf7463 100644
--- a/shell-completion/zsh/_networkctl
+++ b/shell-completion/zsh/_networkctl
@@ -6,6 +6,7 @@ _networkctl_command(){
             'list:List existing links'
 	    'status:Show information about the specified links'
 	    'lldp:Show Link Layer Discovery Protocol status'
+	    'label:Show address labels'
     )
     if (( CURRENT == 1 )); then
         _describe -t commands 'networkctl command' _networkctl_cmds