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/stop | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/container/stop') diff --git a/lib/container/stop b/lib/container/stop index 5099005..514e098 100755 --- a/lib/container/stop +++ b/lib/container/stop @@ -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" @@ -128,7 +128,7 @@ STATE="$(machinectl show ${NAME} 2>&1 | awk -F= '/^State=/ { print $2 }')" case "${CLEAN}" in true) # Removing overlay mounts - CNT_OVERLAY="$(awk -F= '/^cnt.overlay=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + CNT_OVERLAY="$(awk -F= '/^cnt.overlay=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${CNT_OVERLAY}" ] then @@ -148,7 +148,7 @@ case "${CLEAN}" in fi # Removing rw bind mounts - BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${BIND}" ] then @@ -163,7 +163,7 @@ case "${CLEAN}" in fi # Removing ro bind mounts - BIND_RO="$(awk -F= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + BIND_RO="$(awk -F= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" if [ -n "${BIND_RO}" ] then @@ -178,7 +178,7 @@ case "${CLEAN}" in fi # Removing network configuration - VETHS="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf)" + VETHS="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.nspawn)" case "${VETHS}" in "") -- cgit v1.2.3