From 1e03e6dc46624f658239c3179875bd28b67fa91a Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
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 <daniel.baumann@open-infrastructure.net>
---
 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 8477915..85f97a8 100755
--- a/lib/container/auto
+++ b/lib/container/auto
@@ -22,7 +22,7 @@ set -e
 
 COMMAND="$(basename ${0})"
 
-CONFIG="/etc/container-tools/config"
+CONFIG="/etc/systemd/nspawn"
 HOOKS="/etc/container-tools/hooks"
 
 Parameters ()
@@ -104,7 +104,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
@@ -113,7 +113,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