From e773a75bae696e70fc54cb70e42df5513b5fc286 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Sat, 2 Mar 2019 10:05:28 +0100
Subject: Removing limit command until its completly tested.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 lib/container/start | 96 ++++++-----------------------------------------------
 1 file changed, 10 insertions(+), 86 deletions(-)

(limited to 'lib/container/start')

diff --git a/lib/container/start b/lib/container/start
index a63c861..925749c 100755
--- a/lib/container/start
+++ b/lib/container/start
@@ -398,70 +398,6 @@ EOF
 			REGISTER="--register=no"
 			;;
 	esac
-
-	BLOCK_IO_DEVICE_WEIGHT="$(awk -F= '/^BlockIODeviceWeight=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
-
-	if [ -n "${BLOCK_IO_DEVICE_WEIGHT}" ]
-	then
-		BLOCK_IO_DEVICE_WEIGHT="BlockIODeviceWeight=${BLOCK_IO_DEVICE_WEIGHT}"
-		SET_PROPERTY="true"
-	fi
-
-	BLOCK_IO_READ_BANDWIDTH="$(awk -F= '/^BlockIOReadBandwidth=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
-
-	if [ -n "${BLOCK_IO_READ_BANDWIDTH}" ]
-	then
-		BLOCK_IO_READ_BANDWIDTH="BlockIOReadBandwidth=${BLOCK_IO_READ_BANDWIDTH}"
-		SET_PROPERTY="true"
-	fi
-
-	BLOCK_IO_WEIGHT="$(awk -F= '/^BlockIOWeight=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
-
-	if [ -n "${BLOCK_IO_WEIGHT}" ]
-	then
-		BLOCK_IO_WEIGHT="BlockIOWeight=${BLOCK_IO_WEIGHT}"
-		SET_PROPERTY="true"
-	fi
-
-	BLOCK_IO_WRITE_BANDWIDTH="$(awk -F= '/^BlockIOWriteBandwidth=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
-
-	if [ -n "${BLOCK_IO_WRITE_BANDWIDTH}" ]
-	then
-		BLOCK_IO_WRITE_BANDWIDTH="BlockIOWriteBandwidth=${BLOCK_IO_WRITE_BANDWIDTH}"
-		SET_PROPERTY="true"
-	fi
-
-	CPU_QUOTA="$(awk -F= '/^CPUQuota=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
-
-	if [ -n "${CPU_QUOTA}" ]
-	then
-		CPU_QUOTA="CPUQuota=${CPU_QUOTA}"
-		SET_PROPERTY="true"
-	fi
-
-	CPU_SHARES="$(awk -F= '/^CPUShares=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
-
-	if [ -n "${CPU_SHARES}" ]
-	then
-		CPU_SHARES="CPUShares=${CPU_SHARES}"
-		SET_PROPERTY="true"
-	fi
-
-	MEMORY_LIMIT="$(awk -F= '/^MemoryLimit=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
-
-	if [ -n "${MEMORY_LIMIT}" ]
-	then
-		MEMORY_LIMIT="MemoryLimit=${MEMORY_LIMIT}"
-		SET_PROPERTY="true"
-	fi
-
-	TASKS_MAX="$(awk -F= '/^TasksMax=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
-
-	if [ -n "${TASKS_MAX}" ]
-	then
-		TASKS_MAX="TasksMax=${TASKS_MAX}"
-		SET_PROPERTY="true"
-	fi
 fi
 
 case "${SYSTEMCTL}" in
@@ -472,26 +408,14 @@ case "${SYSTEMCTL}" in
 		;;
 esac
 
-case "${START}" in
-	true)
-		case "${SET_PROPERTY}" in
-			true)
-				systemctl --runtime set-property ${NAME} ${BLOCK_IO_DEVICE_WEIGHT} ${BLOCK_IO_READ_BANDWIDTH} ${BLOCK_IO_WEIGHT} ${BLOCK_IO_WRITE_BANDWIDTH} ${CPU_QUOTA} ${CPU_SHARES} ${MEMORY_LIMIT} ${TASKS_MAX}
-				;;
-		esac
-		;;
-
-	*)
-		# Run
-		${SETARCH} systemd-nspawn --keep-unit ${BIND} ${BIND_RO} ${BOOT} ${CAPABILITY} ${DIRECTORY} ${DROP_CAPABILITY} ${MACHINE} ${NETWORK_VETH_EXTRA} ${LINK_JOURNAL} ${REGISTER}
+# Run
+${SETARCH} systemd-nspawn --keep-unit ${BIND} ${BIND_RO} ${BOOT} ${CAPABILITY} ${DIRECTORY} ${DROP_CAPABILITY} ${MACHINE} ${NETWORK_VETH_EXTRA} ${LINK_JOURNAL} ${REGISTER}
 
-		# Post hooks
-		for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NAME}.post-${COMMAND}"
-		do
-			if [ -x "${FILE}" ]
-			then
-				"${FILE}"
-			fi
-		done
-		;;
-esac
+# Post hooks
+for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NAME}.post-${COMMAND}"
+do
+	if [ -x "${FILE}" ]
+	then
+		"${FILE}"
+	fi
+done
-- 
cgit v1.2.3