summaryrefslogtreecommitdiffstats
path: root/lib/container/start
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-03-02 10:39:25 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-03-02 10:39:34 +0000
commitc0d285f4b03b176f1e1b5e4ac8968f2c8aa4492d (patch)
treeda3f1fbc3889d6dbe20584434250ed673b84682d /lib/container/start
parentReleasing debian version 20190222-1. (diff)
downloadopen-infrastructure-compute-tools-c0d285f4b03b176f1e1b5e4ac8968f2c8aa4492d.tar.xz
open-infrastructure-compute-tools-c0d285f4b03b176f1e1b5e4ac8968f2c8aa4492d.zip
Merging upstream version 20190301.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/container/start')
-rwxr-xr-xlib/container/start98
1 files changed, 11 insertions, 87 deletions
diff --git a/lib/container/start b/lib/container/start
index a63c861..82f9314 100755
--- a/lib/container/start
+++ b/lib/container/start
@@ -398,100 +398,24 @@ 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
true)
systemctl start ${PROGRAM}@${NAME}.service
- # FIXME start console .. after sleep? + configuration option
+
exit 0
;;
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