From e1ac8c36854fbeb60a53a5090fbb673b2a7b9d09 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 4 Aug 2016 15:45:49 +0200 Subject: Merging upstream version 20160801. Signed-off-by: Daniel Baumann --- share/config/container.conf.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'share/config') diff --git a/share/config/container.conf.in b/share/config/container.conf.in index dd52adb..b5678c0 100644 --- a/share/config/container.conf.in +++ b/share/config/container.conf.in @@ -3,14 +3,16 @@ [start] cnt.auto=@CNT_AUTO@ cnt.network-bridge=@CNT_NETWORK_BRIDGE@ +cnt.overlay=@CNT_OVERLAY@ bind=@BIND@ boot=@BOOT@ capability=@CAPABILITY@ directory=@DIRECTORY@ drop-capability=@DROP_CAPABILITY@ +link-journal=@LINK_JOURNAL@ machine=@MACHINE@ network-veth-extra=@NETWORK_VETH_EXTRA@ -link-journal=@LINK_JOURNAL@ +private-users=@PRIVATE_USERS@ register=@REGISTER@ [limit] -- cgit v1.2.3