From b90ddebe1d1cb49c30c3a9d99119e3b0d14995fd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 18 May 2016 20:28:46 +0200 Subject: Merging upstream version 20160515. Signed-off-by: Daniel Baumann --- share/config/container.conf.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'share/config') diff --git a/share/config/container.conf.in b/share/config/container.conf.in index fbf8078..dd52adb 100644 --- a/share/config/container.conf.in +++ b/share/config/container.conf.in @@ -1,15 +1,15 @@ # container-tools: @NAME@ [start] -cnt.autostart=@CNT_AUTOSTART@ +cnt.auto=@CNT_AUTO@ +cnt.network-bridge=@CNT_NETWORK_BRIDGE@ bind=@BIND@ boot=@BOOT@ capability=@CAPABILITY@ directory=@DIRECTORY@ drop-capability=@DROP_CAPABILITY@ machine=@MACHINE@ -network-veth=@NETWORK_VETH@ -network-bridge=@NETWORK_BRIDGE@ +network-veth-extra=@NETWORK_VETH_EXTRA@ link-journal=@LINK_JOURNAL@ register=@REGISTER@ -- cgit v1.2.3