network: add automatic configuration for the networks created by nspawn --network...

This way, they "just work", similar to --network-veth behaves, as long as
networkd is enabled and running on all involved nodes.

diff --git a/Makefile.am b/Makefile.am
index ee9e91a33982bda0b16132558ced1683fac3197b..aea91e9c948296a928896e89ce95474793eece13 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3598,7 +3598,8 @@ INSTALL_DIRS += \
 dist_network_DATA = \
        network/99-default.link \
        network/80-container-host0.network \
-       network/80-container-ve.network
+       network/80-container-ve.network \
+       network/80-container-vz.network
 
 dist_udevrules_DATA += \
        rules/50-udev-default.rules \

diff --git a/network/80-container-host0.network b/network/80-container-host0.network
index f0626f81b055d78386c6a9b1442b487f41135d5a..561bd1a3b8316cda4d372be795da0139558d6c26 100644 (file)
--- a/network/80-container-host0.network
+++ b/network/80-container-host0.network
@@ -5,6 +5,10 @@
 #  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
+# This network file matches the container-side of the virtual Ethernet link
+# created by systemd-nspawn's --network-veth switch. See systemd-nspawn(1) for
+# details.
+
 [Match]
 Virtualization=container
 Name=host0

diff --git a/network/80-container-ve.network b/network/80-container-ve.network
index abb265ddc49b59800e71115b55aacbbf6b5d79d8..c42c7cc2596805c15ea547858a1a0674c00c0675 100644 (file)
--- a/network/80-container-ve.network
+++ b/network/80-container-ve.network
@@ -5,6 +5,10 @@
 #  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
+# This network file matches the host-side of the virtual Ethernet link
+# created by systemd-nspawn's --network-veth switch. See systemd-nspawn(1) for
+# details.
+
 [Match]
 Name=ve-*
 Driver=veth

diff --git a/network/80-container-vz.network b/network/80-container-vz.network
new file mode 100644 (file)
index 0000000..69a0607
--- /dev/null
+++ b/network/80-container-vz.network
@@ -0,0 +1,22 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+# This network file matches the bridge interface created by systemd-nspawn's
+# --network-zone= switch. See systemd-nspawn(1) for details.
+
+[Match]
+Name=vz-*
+Driver=bridge
+
+[Network]
+# Default to using a /24 prefix, giving up to 253 addresses per virtual network.
+Address=0.0.0.0/24
+LinkLocalAddressing=yes
+DHCPServer=yes
+IPMasquerade=yes
+LLDP=yes
+EmitLLDP=yes