[systemd-commits] 3 commits - TODO man/systemd.link.xml man/systemd.netdev.xml man/systemd.network.xml
Lennart Poettering
lennart at kemper.freedesktop.org
Fri Jun 27 11:50:20 PDT 2014
TODO | 4 ---
man/systemd.link.xml | 9 +++++++
man/systemd.netdev.xml | 20 ++++++++++++++++
man/systemd.network.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 88 insertions(+), 3 deletions(-)
New commits:
commit 102bd40e1ed71c7ab980a90435a1c23d4c786c63
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Jun 27 20:42:36 2014 +0200
man: split systemd.network(5) and related into various sections for better readability
diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index f73182a..05effc3 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -76,6 +76,10 @@
<literal>[Link]</literal> section specifying how the device should be
configured. The first (in lexical order) of the link files that matches
a given device is applied.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>[Match] Section Options</title>
<para>A link file is said to match a device if each of the entries in the
<literal>[Match]</literal> section matches, or if the section is empty.
@@ -156,6 +160,11 @@
</varlistentry>
</variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>[Link] Section Options</title>
+
<para>The <literal>[Link]</literal> section accepts the following
keys:</para>
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index c17ae9e..bf1d24e 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -78,6 +78,11 @@
<filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
disables the configuration file entirely.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>[Match] Section Options</title>
+
<para>A virtual network device is only created if the
<literal>[Match]</literal> section matches the current
environment, or if the section is empty. The following keys are accepted:</para>
@@ -127,6 +132,11 @@
</varlistentry>
</variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>[NetDev] Section Options</title>
+
<para>The <literal>[NetDev]</literal> section accepts the following
keys:</para>
@@ -149,6 +159,11 @@
</varlistentry>
</variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>[VLAN] Section Options</title>
+
<para>The <literal>[VLAN]</literal> section only applies for netdevs of kind <literal>vlan</literal>,
and accepts the following key:</para>
@@ -162,6 +177,11 @@
</varlistentry>
</variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>[MACVLAN] Section Options</title>
+
<para>The <literal>[MACVLAN]</literal> section only applies for netdevs of kind
<literal>macvlan</literal>, and accepts the following key:</para>
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 349ccc5..8b2dd2f 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -78,6 +78,11 @@
<filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
disables the configuration file entirely.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>[Match] Section Options</title>
+
<para>The network file contains a <literal>[Match]</literal> section,
which determines if a given network file may be applied to a given device;
and a <literal>[Network]</literal> section specifying how the device should
@@ -172,6 +177,11 @@
</varlistentry>
</variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>[Network] Section Options</title>
+
<para>The <literal>[Network]</literal> section accepts the following keys:</para>
<variablelist class='network-directives'>
@@ -294,6 +304,11 @@
</varlistentry>
</variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>[Address] Section Options</title>
+
<para>An <literal>[Address]</literal> section accepts the following keys.
Specify several <literal>[Address]</literal> sections to configure several
addresses.</para>
@@ -321,7 +336,10 @@
</listitem>
</varlistentry>
</variablelist>
+ </refsect1>
+ <refsect1>
+ <title>[Route] Section Options</title>
<para>The <literal>[Route]</literal> section accepts the following keys. Specify
several <literal>[Route]</literal> sections to configure several routes.</para>
@@ -340,7 +358,10 @@
</listitem>
</varlistentry>
</variablelist>
+ </refsect1>
+ <refsect1>
+ <title>[DHCPv4] Section Options</title>
<para>The <literal>[DHCPv4]</literal> section accepts the following keys:</para>
<variablelist class='network-directives'>
commit fed515f0a845a2ce387cb2d1fcac1ca36b5bac46
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Jun 27 20:42:31 2014 +0200
update TODO
diff --git a/TODO b/TODO
index 083059c..10139e3 100644
--- a/TODO
+++ b/TODO
@@ -25,9 +25,7 @@ External:
Features:
-* allow users to kill or lock their own sessions
-
-* ship sleep.conf by default
+* logind: allow users to kill or lock their own sessions
* support empty /etc boots nicely:
- nspawn/gpt-generator: introduce new gpt partition type for /usr
commit 4bb278e51e81ea3c5c62e1f7e296309b0fac8e3d
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Jun 27 20:42:06 2014 +0200
man: document automatic networkd IP range allocation
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index efe6ce7..349ccc5 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -210,6 +210,43 @@
an Address key (see below). This option may be specified
more than once.
</para>
+
+ <para>If the specified
+ address is 0.0.0.0
+ (for IPv4) or [::]
+ (for IPv6) a new
+ address range of the
+ requested size is
+ automatically
+ allocated from a
+ system-wide pool of
+ unused ranges. The
+ allocated range is
+ checked against all
+ current network
+ interfaces and all
+ known network
+ configuration files to
+ avoid IP range
+ conflicts. The default
+ system-wide pool
+ consists of
+ 192.168.0.0/16,
+ 172.16.0.0/12 and
+ 10.0.0.0/8 for IPv4,
+ and [fc00::] for
+ IPv6. This
+ functionality is
+ useful to manage a
+ large number of
+ dynamically created
+ network interfaces
+ with the same network
+ configuration and
+ automatic address
+ range
+ assignment.</para>
+
</listitem>
</varlistentry>
<varlistentry>
More information about the systemd-commits
mailing list