diff options
| author | Simon Spöhel <simon.spoehel@open-infrastructure.net> | 2017-07-09 13:52:29 +0000 |
|---|---|---|
| committer | Simon Spöhel <simon.spoehel@open-infrastructure.net> | 2017-07-09 15:14:27 +0000 |
| commit | b71a3b319fa347157973e45e4e08f407e2cb5d7e (patch) | |
| tree | 234c9d9fdba16e7b997d4e73fc030f37510bde2e /lib/container/list | |
| parent | Updating output of container-shell help. (diff) | |
| download | compute-tools-b71a3b319fa347157973e45e4e08f407e2cb5d7e.tar.xz compute-tools-b71a3b319fa347157973e45e4e08f407e2cb5d7e.zip | |
Making container-tools use nspawn files.
Diffstat (limited to '')
| -rwxr-xr-x | lib/container/list | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/container/list b/lib/container/list index cd88475..2e0bef7 100755 --- a/lib/container/list +++ b/lib/container/list @@ -20,7 +20,7 @@ set -e COMMAND="$(basename ${0})" -CONFIG="/etc/container-tools/config" +CONFIG="/etc/systemd/nspawn" HOOKS="/etc/container-tools/hooks" MACHINES="/var/lib/machines" @@ -327,9 +327,9 @@ for CONTAINER in ${CONTAINERS} do STATE="$(machinectl show ${CONTAINER} 2>&1 | awk -F= '/^State=/ { print $2 }')" - if [ -e "${CONFIG}/${CONTAINER}.conf" ] + if [ -e "${CONFIG}/${CONTAINER}.nspawn" ] then - CONTAINER_SERVER="$(awk -F= '/^cnt.container-server=/ { print $2 }' ${CONFIG}/${CONTAINER}.conf)" + CONTAINER_SERVER="$(crudini --get ${CONFIG}/${CONTAINER}.nspawn ContainerToolsStart cnt.container-server)" CONTAINER_SERVER="${CONTAINER_SERVER:-false}" case "${CONTAINER_SERVER}" in |