Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 84 insertions, 14 deletions

diff --git a/upstream/debian-unstable/man1/networkctl.1 b/upstream/debian-unstable/man1/networkctl.1
index 7bdbc0e0..907e2548 100644
--- a/upstream/debian-unstable/man1/networkctl.1
+++ b/upstream/debian-unstable/man1/networkctl.1
@@ -1,5 +1,5 @@
 '\" t
-.TH "NETWORKCTL" "1" "" "systemd 255" "networkctl"
+.TH "NETWORKCTL" "1" "" "systemd 256~rc3" "networkctl"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -256,15 +256,15 @@ Produces output similar to:
 .RS 4
 .\}
 .nf
-LINK             CHASSIS ID        SYSTEM NAME      CAPS        PORT ID           PORT DESCRIPTION
-enp0s25          00:e0:4c:00:00:00 GS1900           \&.\&.b\&.\&.\&.\&.\&.\&.\&.\&. 2                 Port #2
+LINK    SYSTEM\-NAME SYSTEM\-DESCRIPTION CHASSIS\-ID        PORT\-ID PORT\-DESCRIPTION CAPS
+enp0s25 GS1900      \-                  00:e0:4c:00:00:00 2       Port #2           \&.\&.b\&.\&.\&.\&.\&.\&.\&.\&.
 
 Capability Flags:
 o \- Other; p \- Repeater;  b \- Bridge; w \- WLAN Access Point; r \- Router;
 t \- Telephone; d \- DOCSIS cable device; a \- Station; c \- Customer VLAN;
 s \- Service VLAN, m \- Two\-port MAC Relay (TPMR)
 
-1 neighbors listed\&.
+1 neighbor(s) listed\&.
 .fi
 .if n \{\
 .RE
@@ -380,7 +380,11 @@ Edit network configuration files, which include
 \&.netdev, and
 \&.link
 files\&. If no network config file matching the given name is found, a new one will be created under
-/etc/\&. Specially, if the name is prefixed by
+/etc/
+or
+/run/, depending on whether
+\fB\-\-runtime\fR
+is specified\&. Specially, if the name is prefixed by
 "@", it will be treated as a network interface, and editing will be performed on the network config files associated with it\&. Additionally, the interface name can be suffixed with
 ":network"
 (default) or
@@ -406,15 +410,69 @@ for more information\&.
 Added in version 254\&.
 .RE
 .PP
-\fBcat\fR \fIFILE\fR|\fI@DEVICE\fR\&...
+\fBcat\fR [\fIFILE\fR|\fI@DEVICE\fR\&...]
 .RS 4
 Show network configuration files\&. This command honors the
 "@"
 prefix in the same way as
-\fBedit\fR\&.
+\fBedit\fR\&. When no argument is specified,
+\fBnetworkd.conf\fR(5)
+and its drop\-in files will be shown\&.
 .sp
 Added in version 254\&.
 .RE
+.PP
+\fBmask\fR \fIFILE\fR\&...
+.RS 4
+Mask network configuration files, which include
+\&.network,
+\&.netdev, and
+\&.link
+files\&. A symlink of the given name will be created under
+/etc/
+or
+/run/, depending on whether
+\fB\-\-runtime\fR
+is specified, that points to
+/dev/null\&. If a non\-empty config file with the specified name exists under the target directory or a directory with higher priority (e\&.g\&.
+\fB\-\-runtime\fR
+is used while an existing config resides in
+/etc/), the operation is aborted\&.
+.sp
+This command honors
+\fB\-\-no\-reload\fR
+in the same way as
+\fBedit\fR\&.
+.sp
+Added in version 256\&.
+.RE
+.PP
+\fBunmask\fR \fIFILE\fR\&...
+.RS 4
+Unmask network configuration files, i\&.e\&. reverting the effect of
+\fBmask\fR\&. Note that this command operates regardless of the scope of the directory, i\&.e\&.
+\fB\-\-runtime\fR
+is of no effect\&.
+.sp
+This command honors
+\fB\-\-no\-reload\fR
+in the same way as
+\fBedit\fR
+and
+\fBmask\fR\&.
+.sp
+Added in version 256\&.
+.RE
+.PP
+\fBpersistent\-storage\fR \fIBOOL\fR
+.RS 4
+Notify
+systemd\-networkd\&.service
+that the persistent storage for the service is ready\&. This is called by
+systemd\-networkd\-persistent\-storage\&.service\&. Usually, this command should not be called manually by users or administrators\&.
+.sp
+Added in version 256\&.
+.RE
 .SH "OPTIONS"
 .PP
 The following options are understood:
@@ -450,7 +508,7 @@ When used with
 Added in version 245\&.
 .RE
 .PP
-\fB\-\-drop\-in=\fR\fINAME\fR
+\fB\-\-drop\-in=\fR\fB\fINAME\fR\fR
 .RS 4
 When used with
 \fBedit\fR, edit the drop\-in file
@@ -464,15 +522,30 @@ Added in version 254\&.
 .RS 4
 When used with
 \fBedit\fR,
+\fBmask\fR, or
+\fBunmask\fR,
 \fBsystemd-networkd.service\fR(8)
 or
 \fBsystemd-udevd.service\fR(8)
-will not be reloaded after the editing finishes\&.
+will not be reloaded after the operation finishes\&.
 .sp
 Added in version 254\&.
 .RE
 .PP
-\fB\-\-json=\fR\fIMODE\fR
+\fB\-\-runtime\fR
+.RS 4
+When used with
+\fBedit\fR
+or
+\fBmask\fR, operate on the file under
+/run/
+instead of
+/etc/\&.
+.sp
+Added in version 256\&.
+.RE
+.PP
+\fB\-\-json=\fR\fB\fIMODE\fR\fR
 .RS 4
 Shows output formatted as JSON\&. Expects one of
 "short"
@@ -507,10 +580,7 @@ Do not pipe output into a pager\&.
 On success, 0 is returned, a non\-zero failure code otherwise\&.
 .SH "SEE ALSO"
 .PP
-\fBsystemd-networkd.service\fR(8),
-\fBsystemd.network\fR(5),
-\fBsystemd.netdev\fR(5),
-\fBip\fR(8)
+\fBsystemd-networkd.service\fR(8), \fBsystemd.network\fR(5), \fBsystemd.netdev\fR(5), \fBip\fR(8)
 .SH "NOTES"
 .IP " 1." 4
 RFC 3484