diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-05-06 21:03:40 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-05-09 15:45:31 +0200 |
| commit | 3af18d8eab661143ef89274607c513a860ede808 (patch) | |
| tree | 64cf00a4d48e0bf0cb81f6028368ba827351a486 | |
| parent | 22b28dfdc78680a5c03e6af3b0ce6bc96f8174a1 (diff) | |
network: add automatic configuration for the networks created by nspawn --network-zone=
This way, they "just work", similar to --network-veth behaves, as long as
networkd is enabled and running on all involved nodes.
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | network/80-container-host0.network | 4 | ||||
| -rw-r--r-- | network/80-container-ve.network | 4 | ||||
| -rw-r--r-- | network/80-container-vz.network | 22 |
4 files changed, 32 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index ee9e91a339..aea91e9c94 100644 --- 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 f0626f81b0..561bd1a3b8 100644 --- 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 abb265ddc4..c42c7cc259 100644 --- 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 index 0000000000..69a0607820 --- /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 |