From 221da55a6498874224c44309ab7636fe04de13b7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 18 Jun 2016 08:31:19 +0200 Subject: Correcting bind mount directory removal in container remove command to work with multiple directories at once. Signed-off-by: Daniel Baumann --- lib/container/remove | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/container/remove b/lib/container/remove index f43bf1c..e4bb20c 100755 --- a/lib/container/remove +++ b/lib/container/remove @@ -116,13 +116,19 @@ esac # data if [ -e "${CONFIG}/${NAME}.conf" ] then + # Removing bind mounts BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.conf)" - DIRECTORY="$(echo ${BIND} | awk -F: '{ print $1 }')" - - if [ -e "${DIRECTORY}" ] + if [ -n "${BIND}" ] then - rmdir --ignore-fail-on-non-empty --parents ${DIRECTORY} || true + BINDS="$(echo ${BIND} | sed -e 's|;| |g')" + + for BIND in ${BINDS} + do + DIRECTORY="$(echo ${BIND} | awk -F: '{ print $1 }')" + + rmdir --ignore-fail-on-non-empty --parents ${DIRECTORY} > /dev/null 2>&1 || true + done fi fi -- cgit v1.2.3