From 64d33d4cef3b79122cbe4b62b80817f679b656df Mon Sep 17 00:00:00 2001
From: Katharina Drexel <katharina.drexel@bfh.ch>
Date: Tue, 6 Oct 2020 16:45:04 +0200
Subject: Adding overlay options to debconf script.

Signed-off-by: Katharina Drexel <katharina.drexel@bfh.ch>
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 share/scripts/debconf                | 21 ++++++++++++++++++++-
 share/scripts/debconf.d/0003-debconf |  7 +++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

(limited to 'share/scripts')

diff --git a/share/scripts/debconf b/share/scripts/debconf
index 6d21951..be0fae0 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -167,6 +167,7 @@ Mount ()
 	then
 		CNT_OVERLAYS="$(echo ${CNT_OVERLAY} | sed -e 's|;| |g')"
 
+		COUNT="0"
 		for CNT_OVERLAY in ${CNT_OVERLAYS}
 		do
 			DIRECTORY_LOWER="$(echo ${CNT_OVERLAY} | awk -F: '{ print $1 }')"
@@ -174,12 +175,23 @@ Mount ()
 			DIRECTORY_WORK="$(echo ${CNT_OVERLAY} | awk -F: '{ print $3 }')"
 			DIRECTORY_MERGED="$(echo ${CNT_OVERLAY} | awk -F: '{ print $4 }')"
 
+			COUNT="$((${COUNT} + 1))"
+			CNT_OVERLAY_OPTION="$(echo ${CNT_OVERLAY_OPTIONS} | awk -F ';' "{ print \$${COUNT} }")"
+
 			for DIRECTORY in "${DIRECTORY_LOWER}" "${DIRECTORY_UPPER}" "${DIRECTORY_WORK}" "${DIRECTORY_MERGED}"
 			do
 				mkdir -p "${DIRECTORY}"
 			done
 
-			mount -t overlay overlay-${NAME} -olowerdir="${DIRECTORY_LOWER}",upperdir="${DIRECTORY_UPPER}",workdir="${DIRECTORY_WORK}" "${DIRECTORY_MERGED}"
+			if ! findmnt -n -o SOURCE "${DIRECTORY_MERGED}" | grep -qs '^overlay-'
+			then
+				if [ -n "${CNT_OVERLAY_OPTION}" ]
+				then
+					CNT_OVERLAY_OPTION="-o ${CNT_OVERLAY_OPTION}"
+				fi
+
+				mount -t overlay overlay-${NAME} ${CNT_OVERLAY_OPTION} -olowerdir="${DIRECTORY_LOWER}",upperdir="${DIRECTORY_UPPER}",workdir="${DIRECTORY_WORK}" "${DIRECTORY_MERGED}"
+			fi
 		done
 	fi
 }
@@ -205,6 +217,12 @@ Umount ()
 				rmdir --ignore-fail-on-non-empty --parents ${DIRECTORY} > /dev/null 2>&1 || true
 			done
 		done
+
+		# empty workdir otherwise there might happen stale file handles
+		if [ -d "${DIRECTORY_WORK}" ]
+		then
+			rm --preserve-root --one-file-system -rf "${DIRECTORY_WORK}"/*
+		fi
 	fi
 
 	# Unmounting ro bind mounts
@@ -1018,6 +1036,7 @@ Commands ()
 		-e "s|^cnt.container-server=.*|cnt.container-server=${CNT_CONTAINER_SERVER}|g" \
 		-e "s|^cnt.network-bridge=.*|cnt.network-bridge=${HOST_INTERFACE_NAME}:${NETWORK1_BRIDGE:-bridge0}|g" \
 		-e "s|^cnt.overlay=.*|cnt.overlay=${CNT_OVERLAY}|g" \
+		-e "s|^cnt.overlay-options=.*|cnt.overlay-options=${CNT_OVERLAY_OPTIONS}|g" \
 		-e "s|^bind=.*|bind=${BIND}|g" \
 		-e "s|^bind-ro=.*|bind-ro=${BIND_RO}|g" \
 		-e "s|^network-veth-extra=.*|network-veth-extra=${HOST_INTERFACE_NAME}:eno1|g" \
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf
index 1fcb878..dc2db47 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -1246,6 +1246,13 @@ Internal_options ()
 	fi
 
 	echo "CNT_OVERLAY=\"${CNT_OVERLAY}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
+
+	if db_get container/overlay-options
+	then
+		CNT_OVERLAY_OPTIONS="${RET}" # string (w/ empty)
+	fi
+
+	echo "CNT_OVERLAY_OPTIONS=\"${CNT_OVERLAY_OPTIONS}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
 }
 
 Mode
-- 
cgit v1.2.3