summaryrefslogtreecommitdiffstats
path: root/lib/container/create
diff options
context:
space:
mode:
authorNik Lutz <nik@netstyle.ch>2016-05-12 15:40:10 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-05-18 18:26:06 +0000
commitbc53e5a0e1a692200313d64ff0a1fd8d8b34ab4f (patch)
tree182218c80b551f28ec8109c8de324acef1dd026d /lib/container/create
parentAdding veth name (cnt-debconf/network[0-9]/veth) configuration option to debc... (diff)
downloadcompute-tools-bc53e5a0e1a692200313d64ff0a1fd8d8b34ab4f.tar.xz
compute-tools-bc53e5a0e1a692200313d64ff0a1fd8d8b34ab4f.zip
Using systemd-nspawn '--network-veth-extra=' instead of '--network-veth' (prerequisite for multiple network interface support per container).
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to 'lib/container/create')
-rwxr-xr-xlib/container/create2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/container/create b/lib/container/create
index fab9f5b..4d1d19b 100755
--- a/lib/container/create
+++ b/lib/container/create
@@ -135,7 +135,7 @@ sed -e "s|@CNT_AUTOSTART@|${CNT_AUTOSTART}|g" \
-e "s|@DIRECTORY@|${MACHINES}/${NAME}|g" \
-e "s|@DROP_CAPABILITY@|${DROP_CAPABILITY}|g" \
-e "s|@MACHINE@|${NAME}|g" \
- -e "s|@NETWORK_VETH@|yes|g" \
+ -e "s|@NETWORK_VETH_EXTRA@|${NETWORK_VETH_EXTRA}|g" \
-e "s|@NETWORK_BRIDGE@|br0|g" \
-e "s|@LINK_JOURNAL@|no|g" \
-e "s|@REGISTER@|yes|g" \