summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-05-17 21:32:13 +0200
committerLennart Poettering <lennart@poettering.net>2014-05-18 20:52:49 +0900
commit4eaea66423ca58dfd7cfd1099ed902d7c81d8622 (patch)
tree4fc559d258c44e6cc589ebfc43140ba146d0b0de
parenta46fe318fccbbb3a7d629f95fc8fdbf4c33ed119 (diff)
network: always take possession of host side of nspawn veth tunnels and do IPv4LL on them
-rw-r--r--Makefile.am3
-rw-r--r--network/80-container-host0.network7
-rw-r--r--network/80-container-ve.network13
3 files changed, 22 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 6e0a59d31f..6e01188410 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2641,7 +2641,8 @@ INSTALL_DIRS += \
dist_network_DATA = \
network/99-default.link \
- network/80-container-host0.network
+ network/80-container-host0.network \
+ network/80-container-ve.network
dist_udevrules_DATA += \
rules/42-usb-hid-pm.rules \
diff --git a/network/80-container-host0.network b/network/80-container-host0.network
index 5d327b4fdd..8d9293f239 100644
--- a/network/80-container-host0.network
+++ b/network/80-container-host0.network
@@ -1,3 +1,10 @@
+# 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.
+
[Match]
Virtualization=container
Name=host0
diff --git a/network/80-container-ve.network b/network/80-container-ve.network
new file mode 100644
index 0000000000..f0c02b0ee5
--- /dev/null
+++ b/network/80-container-ve.network
@@ -0,0 +1,13 @@
+# 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.
+
+[Match]
+Name=ve-*
+Driver=veth
+
+[Network]
+IPv4LL=yes