diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-05-22 21:34:07 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-05-22 21:34:07 +0200 |
| commit | aa27b158cd13271991aa126baf355288f6359487 (patch) | |
| tree | 2b92dde5bd583dd521ec9b62810b5702f027ac85 /network | |
| parent | 4c89c718b555be6ac0b3bfb47f73255b637e16e5 (diff) | |
| download | systemd-aa27b158cd13271991aa126baf355288f6359487.tar.gz | |
Imported Upstream version 230
Diffstat (limited to 'network')
| -rw-r--r-- | network/80-container-host0.network | 6 | ||||
| -rw-r--r-- | network/80-container-ve.network | 6 | ||||
| -rw-r--r-- | network/80-container-vz.network | 22 |
3 files changed, 34 insertions, 0 deletions
diff --git a/network/80-container-host0.network b/network/80-container-host0.network index b65cc6acbe..b012cf98cb 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 @@ -12,6 +16,8 @@ Name=host0 [Network] DHCP=yes LinkLocalAddressing=yes +LLDP=yes +EmitLLDP=customer-bridge [DHCP] UseTimezone=yes diff --git a/network/80-container-ve.network b/network/80-container-ve.network index 72c20eba55..ac796bfb07 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 @@ -15,3 +19,5 @@ Address=0.0.0.0/28 LinkLocalAddressing=yes DHCPServer=yes IPMasquerade=yes +LLDP=yes +EmitLLDP=customer-bridge diff --git a/network/80-container-vz.network b/network/80-container-vz.network new file mode 100644 index 0000000000..3d532d6f60 --- /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=customer-bridge |