From d4de2b2afff6bc1f2d9ca960197bb0388c154221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 3 Mar 2020 19:08:26 +0100 Subject: [PATCH] man: document that .link/.network/.netdev files have the usual ini syntax Fixes #1266. --- man/systemd.link.xml | 7 +++++-- man/systemd.netdev.xml | 5 +++-- man/systemd.network.xml | 6 ++++-- man/systemd.syntax.xml | 9 +++++++++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/man/systemd.link.xml b/man/systemd.link.xml index 130cc78693..1dca495a03 100644 --- a/man/systemd.link.xml +++ b/man/systemd.link.xml @@ -26,8 +26,11 @@ Description - Network link configuration is performed by the - net_setup_link udev builtin. + A plain ini-style text file that encodes configuration for matching network devices, used by + systemd-udev8 and in + particular its net_setup_link builtin. See + systemd.syntax5 for a + general description of the syntax. The link files are read from the files located in the system network directory /usr/lib/systemd/network, diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 6e215a38bb..6ad1dc9e73 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -27,9 +27,10 @@ Description - Network setup is performed by + A plain ini-style text file that encodes configuration about a virtual network device, used by systemd-networkd8. - + See systemd.syntax5 + for a general description of the syntax. The main Virtual Network Device file must have the extension .netdev; other extensions are ignored. Virtual network devices are created as soon as networkd is diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 9da078cb7d..bd19b766c3 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -28,9 +28,11 @@ Description - Network setup is performed by + A plain ini-style text file that encodes network configuration for matching network interfaces, + used by systemd-networkd8. - + See systemd.syntax5 + for a general description of the syntax. The main network file must have the extension .network; other extensions are ignored. Networks are applied to links whenever the links appear. diff --git a/man/systemd.syntax.xml b/man/systemd.syntax.xml index 05786cc534..04b1564b17 100644 --- a/man/systemd.syntax.xml +++ b/man/systemd.syntax.xml @@ -46,6 +46,15 @@ systemd.nspawn5 + link files, see + systemd.link5 + + + netdev and network files, see + systemd.netdev5, + systemd.network5 + + daemon config files, see systemd-system.conf5, systemd-user.conf5,