summaryrefslogtreecommitdiffstats
path: root/lib/container/auto
diff options
context:
space:
mode:
authorSimon Spöhel <simon.spoehel@open-infrastructure.net>2017-07-09 13:52:29 +0000
committerSimon Spöhel <simon.spoehel@open-infrastructure.net>2017-07-09 15:14:27 +0000
commitb71a3b319fa347157973e45e4e08f407e2cb5d7e (patch)
tree234c9d9fdba16e7b997d4e73fc030f37510bde2e /lib/container/auto
parentUpdating output of container-shell help. (diff)
downloadcompute-tools-b71a3b319fa347157973e45e4e08f407e2cb5d7e.tar.xz
compute-tools-b71a3b319fa347157973e45e4e08f407e2cb5d7e.zip
Making container-tools use nspawn files.
Diffstat (limited to '')
-rwxr-xr-xlib/container/auto6
1 files changed, 3 insertions, 3 deletions
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