summaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
Diffstat (limited to 'man')
-rw-r--r--man/systemd-network-generator.service.xml6
-rw-r--r--man/systemd.system-credentials.xml17
2 files changed, 13 insertions, 10 deletions
diff --git a/man/systemd-network-generator.service.xml b/man/systemd-network-generator.service.xml
index 59d608028a..8962f1a05f 100644
--- a/man/systemd-network-generator.service.xml
+++ b/man/systemd-network-generator.service.xml
@@ -128,13 +128,15 @@
<variablelist class='system-credentials'>
<varlistentry>
- <term><varname>network.netdev.*</varname></term>
+ <term><varname>network.conf.*</varname></term>
<term><varname>network.link.*</varname></term>
+ <term><varname>network.netdev.*</varname></term>
<term><varname>network.network.*</varname></term>
<listitem><para>These credentials should contain valid
- <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>networkd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.link</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
configuration data. From each matching credential a separate file is created. Example: a passed
credential <filename>network.link.50-foobar</filename> will be copied into a configuration file
diff --git a/man/systemd.system-credentials.xml b/man/systemd.system-credentials.xml
index 271c495d2a..e8e2985a42 100644
--- a/man/systemd.system-credentials.xml
+++ b/man/systemd.system-credentials.xml
@@ -138,20 +138,21 @@
</varlistentry>
<varlistentry>
- <term><varname>network.netdev.*</varname></term>
+ <term><varname>network.conf.*</varname></term>
<term><varname>network.link.*</varname></term>
+ <term><varname>network.netdev.*</varname></term>
<term><varname>network.network.*</varname></term>
<listitem>
<para>Configures network devices. Read by
- <citerefentry><refentrytitle>systemd-network-generator.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. These
- credentials directly translate to a matching <filename>*.netdev</filename>,
- <filename>*.link</filename> or <filename>*.network</filename> file. Example: the contents of a
- credential <filename>network.link.50-foobar</filename> will be copied into a file
- <filename>50-foobar.link</filename>. See
- <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-network-generator.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+ These credentials should contain valid
+ <citerefentry><refentrytitle>networkd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.link</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
- for details.</para>
+ configuration data. From each matching credential a separate file is created. Example: the contents
+ of a credential <filename>network.link.50-foobar</filename> will be copied into a file
+ <filename>50-foobar.link</filename>.</para>
<para>Note that the resulting files are created world-readable, it's hence recommended to not include
secrets in these credentials, but supply them via separate credentials directly to