From b71a3b319fa347157973e45e4e08f407e2cb5d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Sp=C3=B6hel?= Date: Sun, 9 Jul 2017 15:52:29 +0200 Subject: Making container-tools use nspawn files. --- lib/container/auto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/container/auto') diff --git a/lib/container/auto b/lib/container/auto index cbacad2..9db28e6 100755 --- a/lib/container/auto +++ b/lib/container/auto @@ -20,7 +20,7 @@ set -e COMMAND="$(basename ${0})" -CONFIG="/etc/container-tools/config" +CONFIG="/etc/systemd/nspawn" HOOKS="/etc/container-tools/hooks" Parameters () @@ -102,7 +102,7 @@ case "${FORCE}" in ;; esac -for FILE in "${CONFIG}"/*.conf +for FILE in "${CONFIG}"/*.nspawn do if grep -Eqs "^ *cnt.auto=force-true" "${FILE}" then @@ -111,7 +111,7 @@ do if grep -Eqs "^ *cnt.auto=(force-true|true)" "${FILE}" && grep -Eqs "^ *cnt.container-server=${HOST}" "${FILE}" then - CONTAINER="$(basename ${FILE} .conf)" + CONTAINER="$(basename ${FILE} .nspawn)" cnt ${ACTION} -n ${CONTAINER} ${OPTIONS} || true fi -- cgit v1.2.3