From 18068f0826aeafc5643f86d915e12a84695e35a4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 21 Apr 2016 19:46:30 +0200 Subject: Merging upstream version 20160401. Signed-off-by: Daniel Baumann --- share/config/container.conf.in | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'share/config') diff --git a/share/config/container.conf.in b/share/config/container.conf.in index 7a0d826..fbf8078 100644 --- a/share/config/container.conf.in +++ b/share/config/container.conf.in @@ -1,11 +1,24 @@ # container-tools: @NAME@ [start] +cnt.autostart=@CNT_AUTOSTART@ bind=@BIND@ boot=@BOOT@ +capability=@CAPABILITY@ directory=@DIRECTORY@ +drop-capability=@DROP_CAPABILITY@ machine=@MACHINE@ network-veth=@NETWORK_VETH@ network-bridge=@NETWORK_BRIDGE@ link-journal=@LINK_JOURNAL@ register=@REGISTER@ + +[limit] +BlockIODeviceWeight= +BlockIOReadBandwidth= +BlockIOWeight= +BlockIOWriteBandwidth= +CPUQuota= +CPUShares= +MemoryLimit= +TasksMax= -- cgit v1.2.3