From 1e03e6dc46624f658239c3179875bd28b67fa91a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 6 Oct 2017 17:05:42 +0200 Subject: Switching to systemd-nspawn configuration files from /etc/container-tools/config. Signed-off-by: Daniel Baumann --- lib/container/list | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/container/list') 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 -- cgit v1.2.3