From b71a3b319fa347157973e45e4e08f407e2cb5d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Sp=C3=B6hel?= Date: Sun, 9 Jul 2017 15:52:29 +0200 Subject: Making container-tools use nspawn files. --- share/config/container.conf.in | 28 ---------------------------- share/config/container.nspawn.in | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 28 deletions(-) delete mode 100644 share/config/container.conf.in create mode 100644 share/config/container.nspawn.in (limited to 'share/config') diff --git a/share/config/container.conf.in b/share/config/container.conf.in deleted file mode 100644 index 322e2c9..0000000 --- a/share/config/container.conf.in +++ /dev/null @@ -1,28 +0,0 @@ -# container-tools: @NAME@ - -[start] -cnt.auto=@CNT_AUTO@ -cnt.container-server=@CNT_CONTAINER_SERVER@ -cnt.network-bridge=@CNT_NETWORK_BRIDGE@ -cnt.overlay=@CNT_OVERLAY@ -bind=@BIND@ -bind-ro=@BIND_RO@ -boot=@BOOT@ -capability=@CAPABILITY@ -directory=@DIRECTORY@ -drop-capability=@DROP_CAPABILITY@ -link-journal=@LINK_JOURNAL@ -machine=@MACHINE@ -network-veth-extra=@NETWORK_VETH_EXTRA@ -private-users=@PRIVATE_USERS@ -register=@REGISTER@ - -[limit] -BlockIODeviceWeight= -BlockIOReadBandwidth= -BlockIOWeight= -BlockIOWriteBandwidth= -CPUQuota= -CPUShares= -MemoryLimit= -TasksMax= diff --git a/share/config/container.nspawn.in b/share/config/container.nspawn.in new file mode 100644 index 0000000..774df95 --- /dev/null +++ b/share/config/container.nspawn.in @@ -0,0 +1,36 @@ +# systemd-nspawn @NAME@ + +[Exec] +Boot=@BOOT@ +Capability=@CAPABILITY@ +DropCapability=@DROP_CAPABILITY@ +PrivateUsers=@PRIVATE_USERS@ + +[Files] +Bind=@BIND@ +BindReadOnly=@BIND_RO@ +Overlay=@CNT_OVERLAY@ + +[Network] +VirtualEthernetExtra= + +# open-infrastructure-container-tools extension +[ContainerToolsStart] +cnt.auto=@CNT_AUTO@ +cnt.container-server=@CNT_CONTAINER_SERVER@ +cnt.network-bridge=@CNT_NETWORK_BRIDGE@ +directory=@DIRECTORY@ +link-journal=@LINK_JOURNAL@ +machine=@MACHINE@ +network-veth-extra=@NETWORK_VETH_EXTRA@ +register=@REGISTER@ + +[ContainerToolsLimit] +BlockIODeviceWeight= +BlockIOReadBandwidth= +BlockIOWeight= +BlockIOWriteBandwidth= +CPUQuota= +CPUShares= +MemoryLimit= +TasksMax= -- cgit v1.2.3