From c61068858b8ead1acda26fd20dde2e8b5be068aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sp=C3=B6hel?=
 <simon.spoehel@open-infrastructure.net>
Date: Sun, 9 Jul 2017 16:00:34 +0200
Subject: Merging sections for container-tools in nspawn file.

---
 lib/container/list               |  2 +-
 lib/container/start              | 26 +++++++++++++-------------
 lib/container/stop               |  2 +-
 share/config/container.nspawn.in |  4 +---
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/lib/container/list b/lib/container/list
index 2e0bef7..9806cf8 100755
--- a/lib/container/list
+++ b/lib/container/list
@@ -329,7 +329,7 @@ do
 
 	if [ -e "${CONFIG}/${CONTAINER}.nspawn" ]
 	then
-		CONTAINER_SERVER="$(crudini --get ${CONFIG}/${CONTAINER}.nspawn ContainerToolsStart cnt.container-server)"
+		CONTAINER_SERVER="$(crudini --get ${CONFIG}/${CONTAINER}.nspawn ContainerTools cnt.container-server)"
 		CONTAINER_SERVER="${CONTAINER_SERVER:-false}"
 
 		case "${CONTAINER_SERVER}" in
diff --git a/lib/container/start b/lib/container/start
index b19b482..da44dec 100755
--- a/lib/container/start
+++ b/lib/container/start
@@ -266,7 +266,7 @@ then
 			;;
 	esac
 
-	DIRECTORY="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerToolsStart directory)"
+	DIRECTORY="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerTools directory)"
 	DIRECTORY="--directory ${DIRECTORY}"
 
 	DROP_CAPABILITY="$(crudini --get ${CONFIG}/${NAME}.nspawn Exec DropCapability)"
@@ -281,7 +281,7 @@ then
 			;;
 	esac
 
-	LINK_JOURNAL="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerToolsStart link-journal)"
+	LINK_JOURNAL="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerTools link-journal)"
 
 	case "${LINK_JOURNAL}" in
 		yes)
@@ -295,7 +295,7 @@ then
 
 	MACHINE="--machine=${NAME}"
 
-	NETWORK_VETH_EXTRA_CONF="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerToolsStart network-veth-extra)"
+	NETWORK_VETH_EXTRA_CONF="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerTools network-veth-extra)"
 	NETWORK_VETH_EXTRA=""
 
 	case "${NETWORK_VETH_EXTRA_CONF}" in
@@ -324,7 +324,7 @@ EOF
 			;;
 	esac
 
-	NETWORK_BRIDGES="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerToolsStart cnt.network-bridge)"
+	NETWORK_BRIDGES="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerTools cnt.network-bridge)"
 
 	case "${NETWORK_BRIDGES}" in
 		"")
@@ -372,7 +372,7 @@ EOF
 			;;
 	esac
 
-	REGISTER="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerToolsStart register)"
+	REGISTER="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerTools register)"
 
 	case "${REGISTER}" in
 		yes)
@@ -384,7 +384,7 @@ EOF
 			;;
 	esac
 
-	BLOCK_IO_DEVICE_WEIGHT="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerToolsLimit BlockIODeviceWeight)"
+	BLOCK_IO_DEVICE_WEIGHT="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerTools BlockIODeviceWeight)"
 
 	if [ -n "${BLOCK_IO_DEVICE_WEIGHT}" ]
 	then
@@ -392,7 +392,7 @@ EOF
 		SET_PROPERTY="true"
 	fi
 
-	BLOCK_IO_READ_BANDWITH="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerToolsLimit BlockIOReadBandwith)"
+	BLOCK_IO_READ_BANDWITH="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerTools BlockIOReadBandwith)"
 
 	if [ -n "${BLOCK_IO_READ_BANDWITH}" ]
 	then
@@ -400,7 +400,7 @@ EOF
 		SET_PROPERTY="true"
 	fi
 
-	BLOCK_IO_WEIGHT="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerToolsLimit BlockIOWeight)"
+	BLOCK_IO_WEIGHT="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerTools BlockIOWeight)"
 
 	if [ -n "${BLOCK_IO_WEIGHT}" ]
 	then
@@ -408,7 +408,7 @@ EOF
 		SET_PROPERTY="true"
 	fi
 
-	BLOCK_IO_WRITE_BANDWITH="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerToolsLimit BlockIOWriteBandwith)"
+	BLOCK_IO_WRITE_BANDWITH="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerTools BlockIOWriteBandwith)"
 
 	if [ -n "${BLOCK_IO_WRITE_BANDWITH}" ]
 	then
@@ -416,7 +416,7 @@ EOF
 		SET_PROPERTY="true"
 	fi
 
-	CPU_QUOTA="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerToolsLimit CPUQuota)"
+	CPU_QUOTA="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerTools CPUQuota)"
 
 	if [ -n "${CPU_QUOTA}" ]
 	then
@@ -424,7 +424,7 @@ EOF
 		SET_PROPERTY="true"
 	fi
 
-	CPU_SHARES="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerToolsLimit CPUShares)"
+	CPU_SHARES="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerTools CPUShares)"
 
 	if [ -n "${CPU_SHARES}" ]
 	then
@@ -432,7 +432,7 @@ EOF
 		SET_PROPERTY="true"
 	fi
 
-	MEMORY_LIMIT="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerToolsLimit MemoryLimit)"
+	MEMORY_LIMIT="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerTools MemoryLimit)"
 
 	if [ -n "${MEMORY_LIMIT}" ]
 	then
@@ -440,7 +440,7 @@ EOF
 		SET_PROPERTY="true"
 	fi
 
-	TASKS_MAX="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerToolsLimit TasksMax)"
+	TASKS_MAX="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerTools TasksMax)"
 
 	if [ -n "${TASKS_MAX}" ]
 	then
diff --git a/lib/container/stop b/lib/container/stop
index 0e3b635..b9fa506 100755
--- a/lib/container/stop
+++ b/lib/container/stop
@@ -176,7 +176,7 @@ case "${CLEAN}" in
 		fi
 
 		# Removing network configuration
-		NETWORK_VETH_EXTRA_CONF="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerToolsStart network-veth-extra)"
+		NETWORK_VETH_EXTRA_CONF="$(crudini --get ${CONFIG}/${NAME}.nspawn ContainerTools network-veth-extra)"
 
 		case "${NETWORK_VETH_EXTRA_CONF}" in
 			"")
diff --git a/share/config/container.nspawn.in b/share/config/container.nspawn.in
index 774df95..917a44e 100644
--- a/share/config/container.nspawn.in
+++ b/share/config/container.nspawn.in
@@ -15,7 +15,7 @@ Overlay=@CNT_OVERLAY@
 VirtualEthernetExtra=
 
 # open-infrastructure-container-tools extension
-[ContainerToolsStart]
+[ContainerTools]
 cnt.auto=@CNT_AUTO@
 cnt.container-server=@CNT_CONTAINER_SERVER@
 cnt.network-bridge=@CNT_NETWORK_BRIDGE@
@@ -24,8 +24,6 @@ link-journal=@LINK_JOURNAL@
 machine=@MACHINE@
 network-veth-extra=@NETWORK_VETH_EXTRA@
 register=@REGISTER@
-
-[ContainerToolsLimit]
 BlockIODeviceWeight=
 BlockIOReadBandwidth=
 BlockIOWeight=
-- 
cgit v1.2.3