diff options
| author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2017-10-06 15:05:42 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2018-05-27 05:59:31 +0000 |
| commit | 1e03e6dc46624f658239c3179875bd28b67fa91a (patch) | |
| tree | 38731aa38565f40cb5419ea8e17af1af84f1f186 /lib/container/list | |
| parent | Releasing version 20180503. (diff) | |
| download | compute-tools-1e03e6dc46624f658239c3179875bd28b67fa91a.tar.xz compute-tools-1e03e6dc46624f658239c3179875bd28b67fa91a.zip | |
Switching to systemd-nspawn configuration files from /etc/container-tools/config.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to 'lib/container/list')
| -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 6fa9eed..6d1efda 100755 --- a/lib/container/list +++ b/lib/container/list @@ -22,7 +22,7 @@ set -e COMMAND="$(basename ${0})" -CONFIG="/etc/container-tools/config" +CONFIG="/etc/systemd/nspawn" HOOKS="/etc/container-tools/hooks" MACHINES="/var/lib/machines" @@ -329,9 +329,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="$(awk -F= '/^cnt.container-server=/ { print $2 }' ${CONFIG}/${CONTAINER}.nspawn)" CONTAINER_SERVER="${CONTAINER_SERVER:-false}" case "${CONTAINER_SERVER}" in |