Merging upstream version 20201030.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

16 files changed, 129 insertions, 54 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 605a6ae..cf94106 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,24 @@
+2020-10-30	Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+	* Releasing version 20201030.
+
+	[ Daniel Baumann ]
+	* Correcting wrong usages of new and old container names in container move command, thanks to Katharina Drexel <katharina.drexel@bfh.ch> for discovering it.
+	* Adding missing colon in container create commands '--script' option.
+	* Adding support for Debian 11 (bullseye) to debootstrap container create script.
+	* Adding support for Debian 11 (bullseye) to debconf container create script.
+	* Adding support for Progress Linux 6 (fuchur) to debconf container create script.
+
+	[ Katharina Drexel ]
+	* Adding overlay options to container configuration file.
+	* Adding overlay options to container create command.
+	* Adding overlay options to container start command.
+	* Adding overlay options to debconf script.
+	* Adding awk optimizations in configuration file handling.
+
+	[ Daniel Baumann ]
+	* Adding one more awk optimizations in container stop command.
+
 2020-08-30	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
 	* Releasing version 20200830.
diff --git a/VERSION.txt b/VERSION.txt
index cf802bc..d724ea4 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20200830
+20201030
diff --git a/lib/container/console b/lib/container/console
index 0628a9d..2a41bf5 100755
--- a/lib/container/console
+++ b/lib/container/console
@@ -81,7 +81,7 @@ then
 	exit 1
 fi
 
-STATE="$(machinectl show ${NAME} 2>&1 | awk -F= '/^State=/ { print $2 }')"
+STATE="$(machinectl show ${NAME} 2>&1 | awk -FState= '/^State=/ { print $2 }')"
 
 case "${STATE}" in
 	running)
diff --git a/lib/container/create b/lib/container/create
index 46fc7ee..519a815 100755
--- a/lib/container/create
+++ b/lib/container/create
@@ -31,7 +31,7 @@ CONFIG_TEMPLATE="/usr/share/${PROJECT}/${PROGRAM}/config/container.conf.in"
 
 Parameters ()
 {
-	GETOPT_LONGOPTIONS="name:,cnt.container-server:,cnt.overlay:,bind:,bind-ro:,capability:,drop-capability:script:,verbose,"
+	GETOPT_LONGOPTIONS="name:,cnt.container-server:,cnt.overlay:,cnt.overlay-options:,bind:,bind-ro:,capability:,drop-capability:,script:,verbose,"
 	GETOPT_OPTIONS="n:,b:,c:,d:,s:,v,"
 
 	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
@@ -67,6 +67,11 @@ Parameters ()
 				shift 2
 				;;
 
+			--cnt.overlay-options)
+				CNT_OVERLAY_OPTIONS="${2}"
+				shift 2
+				;;
+
 			-b|--bind)
 				BIND="${2}"
 				shift 2
@@ -112,7 +117,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [--cnt.container-server=true|false|FQDN] [--cnt.overlay=DIRECTORY_LOWER:DIRECTORY_UPPER:DIRECTORY_WORK:DIRECTORY_MERGED] [-b|--bind DIRECTORY:DIRECTORY[:OPTIONS]] [--bind-ro DIRECTORY:DIRECTORY[:OPTIONS]] [-c|--capability CAPABILITY[,CAPABILITY]] [-d|--drop-capability DROP_CAPABILITY[,DROP_CAPABILITY]] [-s|--script SCRIPT] [-v|--verbose] [-- SCRIPT_OPTIONS]" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [--cnt.container-server=true|false|FQDN] [--cnt.overlay=DIRECTORY_LOWER:DIRECTORY_UPPER:DIRECTORY_WORK:DIRECTORY_MERGED] [--cnt.overlay-options=OPTION[,OPTION]] [-b|--bind DIRECTORY:DIRECTORY[:OPTIONS]] [--bind-ro DIRECTORY:DIRECTORY[:OPTIONS]] [-c|--capability CAPABILITY[,CAPABILITY]] [-d|--drop-capability DROP_CAPABILITY[,DROP_CAPABILITY]] [-s|--script SCRIPT] [-v|--verbose] [-- SCRIPT_OPTIONS]" >&2
 	exit 1
 }
 
@@ -241,6 +246,7 @@ sed	-e "s|@CNT_AUTO@|${CNT_AUTO}|g" \
 	-e "s|@CNT_CONTAINER_SERVER@|${CNT_CONTAINER_SERVER}|g" \
 	-e "s|@CNT_NETWORK_BRIDGE@|${CNT_NETWORK_BRIDGE}|g" \
 	-e "s|@CNT_OVERLAY@|${CNT_OVERLAY}|g" \
+	-e "s|@CNT_OVERLAY_OPTIONS@|${CNT_OVERLAY_OPTIONS}|g" \
 	-e "s|@NAME@|${NAME}|g" \
 	-e "s|@BIND@|${BIND}|g" \
 	-e "s|@BIND_RO@|${BIND_RO}|g" \
diff --git a/lib/container/enter b/lib/container/enter
index 4c7f890..144a06a 100755
--- a/lib/container/enter
+++ b/lib/container/enter
@@ -81,7 +81,7 @@ then
 	exit 1
 fi
 
-STATE="$(machinectl show ${NAME} 2>&1 | awk -F= '/^State=/ { print $2 }')"
+STATE="$(machinectl show ${NAME} 2>&1 | awk -FState= '/^State=/ { print $2 }')"
 
 case "${STATE}" in
 	running)
diff --git a/lib/container/limit b/lib/container/limit
index 42f36a2..233459a 100755
--- a/lib/container/limit
+++ b/lib/container/limit
@@ -121,7 +121,7 @@ then
 	exit 1
 fi
 
-STATE="$(machinectl show ${NAME} 2>&1 | awk -F= '/^State=/ { print $2 }')"
+STATE="$(machinectl show ${NAME} 2>&1 | awk -FState= '/^State=/ { print $2 }')"
 
 case "${STATE}" in
 	running)
diff --git a/lib/container/list b/lib/container/list
index 24457de..cf7b148 100755
--- a/lib/container/list
+++ b/lib/container/list
@@ -328,11 +328,11 @@ fi
 
 for CONTAINER in ${CONTAINERS}
 do
-	STATE="$(machinectl show ${CONTAINER} 2>&1 | awk -F= '/^State=/ { print $2 }')"
+	STATE="$(machinectl show ${CONTAINER} 2>&1 | awk -FState= '/^State=/ { print $2 }')"
 
 	if [ -e "${CONFIG}/${CONTAINER}.conf" ]
 	then
-		CONTAINER_SERVER="$(awk -F= '/^cnt.container-server=/ { print $2 }' ${CONFIG}/${CONTAINER}.conf)"
+		CONTAINER_SERVER="$(awk -Fcnt.container-server= '/^cnt.container-server=/ { print $2 }' ${CONFIG}/${CONTAINER}.conf)"
 		CONTAINER_SERVER="${CONTAINER_SERVER:-false}"
 
 		case "${CONTAINER_SERVER}" in
@@ -367,7 +367,7 @@ do
 
 	if ls "${MACHINES}/${CONTAINER}/etc/systemd/network"/*.network > /dev/null 2>&1
 	then
-		ADDRESS="$(awk -F= '/^Address/ { print $2 }' ${MACHINES}/${CONTAINER}/etc/systemd/network/*.network | head -n1)"
+		ADDRESS="$(awk -FAddress= '/^Address/ { print $2 }' ${MACHINES}/${CONTAINER}/etc/systemd/network/*.network | head -n1)"
 	elif [ -e "${MACHINES}/${CONTAINER}/etc/network/interfaces" ]
 	then
 		ADDRESS="$(awk '/address/ { print $2 }' ${MACHINES}/${CONTAINER}/etc/network/interfaces | head -n1)"
diff --git a/lib/container/move b/lib/container/move
index 377bd7c..f87e5a8 100755
--- a/lib/container/move
+++ b/lib/container/move
@@ -98,7 +98,7 @@ then
 	exit 1
 fi
 
-STATE="$(machinectl show ${OLD} 2>&1 | awk -F= '/^State=/ { print $2 }')"
+STATE="$(machinectl show ${OLD} 2>&1 | awk -FState= '/^State=/ { print $2 }')"
 
 case "${STATE}" in
 	running)
@@ -132,7 +132,7 @@ case "${FORCE}" in
 esac
 
 # Pre hooks
-for FILE in "${HOOKS}/pre-${COMMAND}".* "${HOOKS}/${NAME}.pre-${COMMAND}"
+for FILE in "${HOOKS}/pre-${COMMAND}".* "${HOOKS}/${OLD}.pre-${COMMAND}"
 do
 	if [ -x "${FILE}" ]
 	then
@@ -145,7 +145,7 @@ mv "${CONFIG}/${OLD}.conf" "${CONFIG}/${NEW}.conf"
 mv "${MACHINES}/${OLD}" "${MACHINES}/${NEW}"
 
 # rw bind mounts
-BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+BIND="$(awk -Fbind= '/^bind=/ { print $2 }' ${CONFIG}/${NEW}.conf)"
 
 if [ -n "${BIND}" ]
 then
@@ -172,7 +172,7 @@ then
 fi
 
 # ro bind mounts
-BIND_RO="$(awk -F= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+BIND_RO="$(awk -Fbind-ro= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NEW}.conf)"
 
 if [ -n "${BIND_RO}" ]
 then
@@ -202,7 +202,7 @@ fi
 sed -i -e "s|${OLD}|${NEW}|g" "${CONFIG}/${NEW}.conf"
 
 # Post hooks
-for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NAME}.post-${COMMAND}"
+for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NEW}.post-${COMMAND}"
 do
 	if [ -x "${FILE}" ]
 	then
diff --git a/lib/container/remove b/lib/container/remove
index 208de3d..820e45e 100755
--- a/lib/container/remove
+++ b/lib/container/remove
@@ -145,7 +145,7 @@ then
 	exit 1
 fi
 
-STATE="$(machinectl show ${NAME} 2>&1 | awk -F= '/^State=/ { print $2 }')"
+STATE="$(machinectl show ${NAME} 2>&1 | awk -FState= '/^State=/ { print $2 }')"
 
 case "${STATE}" in
 	running)
@@ -207,7 +207,7 @@ done
 if [ -e "${CONFIG}/${NAME}.conf" ]
 then
 	# Removing rw bind mounts
-	BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	BIND="$(awk -Fbind= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	if [ -n "${BIND}" ]
 	then
@@ -222,7 +222,7 @@ then
 	fi
 
 	# Removing ro bind mounts
-	BIND_RO="$(awk -F= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	BIND_RO="$(awk -Fbind-ro= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	if [ -n "${BIND_RO}" ]
 	then
diff --git a/lib/container/start b/lib/container/start
index 5938193..6309fb1 100755
--- a/lib/container/start
+++ b/lib/container/start
@@ -135,7 +135,7 @@ fi
 
 case "${START}" in
 	false)
-		STATE="$(machinectl show ${NAME} 2>&1 | awk -F= '/^State=/ { print $2 }')"
+		STATE="$(machinectl show ${NAME} 2>&1 | awk -FState= '/^State=/ { print $2 }')"
 
 		case "${STATE}" in
 			running)
@@ -152,7 +152,7 @@ then
 		true)
 			rm -f "${MACHINES}/.#${NAME}.lck"
 
-			VETHS="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf | awk -F: '{ print $1 }')"
+			VETHS="$(awk -Fnetwork-veth-extra= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf | awk -F: '{ print $1 }')"
 
 			for VETH in ${VETHS}
 			do
@@ -203,12 +203,14 @@ esac
 # config
 if [ -e "${CONFIG}/${NAME}.conf" ]
 then
-	CNT_OVERLAY="$(awk -F= '/^cnt.overlay=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	CNT_OVERLAY="$(awk -Fcnt.overlay= '/^cnt.overlay=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	CNT_OVERLAY_OPTIONS="$(awk -Fcnt.overlay-options= '/^cnt.overlay-options=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	if [ -n "${CNT_OVERLAY}" ]
 	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 }')"
@@ -216,6 +218,9 @@ then
 			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}"
@@ -223,12 +228,17 @@ then
 
 			if ! findmnt -n -o SOURCE "${DIRECTORY_MERGED}" | grep -qs '^cnt.overlay-'
 			then
-				mount cnt.overlay-${NAME} -t overlay -olowerdir="${DIRECTORY_LOWER}",upperdir="${DIRECTORY_UPPER}",workdir="${DIRECTORY_WORK}",default_permissions "${DIRECTORY_MERGED}"
+				if [ -n "${CNT_OVERLAY_OPTION}" ]
+				then
+					CNT_OVERLAY_OPTION="-o ${CNT_OVERLAY_OPTION}"
+				fi
+
+				mount cnt.overlay-${NAME} -t overlay ${CNT_OVERLAY_OPTION} -olowerdir="${DIRECTORY_LOWER}",upperdir="${DIRECTORY_UPPER}",workdir="${DIRECTORY_WORK}",default_permissions "${DIRECTORY_MERGED}"
 			fi
 		done
 	fi
 
-	BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	BIND="$(awk -Fbind= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	if [ -n "${BIND}" ]
 	then
@@ -253,7 +263,7 @@ then
 		done
 	fi
 
-	BIND_RO="$(awk -F= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	BIND_RO="$(awk -Fbind-ro= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	if [ -n "${BIND_RO}" ]
 	then
@@ -278,7 +288,7 @@ then
 		done
 	fi
 
-	BOOT="$(awk -F= '/^boot=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo yes)"
+	BOOT="$(awk -Fboot= '/^boot=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo yes)"
 
 	case "${BOOT}" in
 		yes)
@@ -290,7 +300,7 @@ then
 			;;
 	esac
 
-	CAPABILITY="$(awk -F= '/^capability=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	CAPABILITY="$(awk -Fcapability= '/^capability=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	case "${CAPABILITY}" in
 		"")
@@ -302,10 +312,10 @@ then
 			;;
 	esac
 
-	DIRECTORY="$(awk -F= '/^directory=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo ${MACHINES}/${NAMES})"
+	DIRECTORY="$(awk -Fdirectory= '/^directory=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo ${MACHINES}/${NAMES})"
 	DIRECTORY="--directory ${DIRECTORY}"
 
-	DROP_CAPABILITY="$(awk -F= '/^drop-capability=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	DROP_CAPABILITY="$(awk -Fdrop-capability= '/^drop-capability=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	case "${DROP_CAPABILITY}" in
 		"")
@@ -317,7 +327,7 @@ then
 			;;
 	esac
 
-	LINK_JOURNAL="$(awk -F= '/^link-journal=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo no)"
+	LINK_JOURNAL="$(awk -Flink-journal= '/^link-journal=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo no)"
 
 	case "${LINK_JOURNAL}" in
 		yes)
@@ -333,7 +343,7 @@ then
 
 	NETWORK_VETH_EXTRA=""
 
-	VETHS="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	VETHS="$(awk -Fnetwork-veth-extra= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	case "${VETHS}" in
 		"")
@@ -353,7 +363,7 @@ then
 			;;
 	esac
 
-	NETWORK_BRIDGES="$(awk -F= '/^cnt.network-bridge=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	NETWORK_BRIDGES="$(awk -Fcnt.network-bridge= '/^cnt.network-bridge=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	case "${NETWORK_BRIDGES}" in
 		"")
@@ -389,7 +399,7 @@ EOF
 			;;
 	esac
 
-	PRIVATE_USERS="$(awk -F= '/^private-users=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo no)"
+	PRIVATE_USERS="$(awk -Fprivate-users= '/^private-users=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo no)"
 
 	case "${PRIVATE_USERS}" in
 		yes)
@@ -401,7 +411,7 @@ EOF
 			;;
 	esac
 
-	REGISTER="$(awk -F= '/^register=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo yes)"
+	REGISTER="$(awk -Fregister= '/^register=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo yes)"
 
 	case "${REGISTER}" in
 		yes)
@@ -413,7 +423,7 @@ EOF
 			;;
 	esac
 
-	BLOCK_IO_DEVICE_WEIGHT="$(awk -F= '/^BlockIODeviceWeight=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	BLOCK_IO_DEVICE_WEIGHT="$(awk -FBlockIODeviceWeight= '/^BlockIODeviceWeight=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	if [ -n "${BLOCK_IO_DEVICE_WEIGHT}" ]
 	then
@@ -421,7 +431,7 @@ EOF
 		SET_PROPERTY="true"
 	fi
 
-	BLOCK_IO_READ_BANDWIDTH="$(awk -F= '/^BlockIOReadBandwidth=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	BLOCK_IO_READ_BANDWIDTH="$(awk -FBlockIOReadBandwidth= '/^BlockIOReadBandwidth=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	if [ -n "${BLOCK_IO_READ_BANDWIDTH}" ]
 	then
@@ -429,7 +439,7 @@ EOF
 		SET_PROPERTY="true"
 	fi
 
-	BLOCK_IO_WEIGHT="$(awk -F= '/^BlockIOWeight=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	BLOCK_IO_WEIGHT="$(awk -FBlockIOWeight= '/^BlockIOWeight=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	if [ -n "${BLOCK_IO_WEIGHT}" ]
 	then
@@ -437,7 +447,7 @@ EOF
 		SET_PROPERTY="true"
 	fi
 
-	BLOCK_IO_WRITE_BANDWIDTH="$(awk -F= '/^BlockIOWriteBandwidth=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	BLOCK_IO_WRITE_BANDWIDTH="$(awk -FBlockIOWriteBandwidth=/= '/^BlockIOWriteBandwidth=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	if [ -n "${BLOCK_IO_WRITE_BANDWIDTH}" ]
 	then
@@ -445,7 +455,7 @@ EOF
 		SET_PROPERTY="true"
 	fi
 
-	CPU_QUOTA="$(awk -F= '/^CPUQuota=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	CPU_QUOTA="$(awk -FCPUQuota= '/^CPUQuota=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	if [ -n "${CPU_QUOTA}" ]
 	then
@@ -453,7 +463,7 @@ EOF
 		SET_PROPERTY="true"
 	fi
 
-	CPU_SHARES="$(awk -F= '/^CPUShares=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	CPU_SHARES="$(awk -FCPUShares= '/^CPUShares=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	if [ -n "${CPU_SHARES}" ]
 	then
@@ -461,7 +471,7 @@ EOF
 		SET_PROPERTY="true"
 	fi
 
-	MEMORY_LIMIT="$(awk -F= '/^MemoryLimit=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	MEMORY_LIMIT="$(awk -FMemoryLimit= '/^MemoryLimit=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	if [ -n "${MEMORY_LIMIT}" ]
 	then
@@ -469,7 +479,7 @@ EOF
 		SET_PROPERTY="true"
 	fi
 
-	TASKS_MAX="$(awk -F= '/^TasksMax=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+	TASKS_MAX="$(awk -FTasksMax= '/^TasksMax=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 	if [ -n "${TASKS_MAX}" ]
 	then
diff --git a/lib/container/stop b/lib/container/stop
index a6bb761..a299cb1 100755
--- a/lib/container/stop
+++ b/lib/container/stop
@@ -150,12 +150,12 @@ do
 	fi
 done
 
-STATE="$(machinectl show ${NAME} 2>&1 | awk -F= '/^State=/ { print $2 }')"
+STATE="$(machinectl show ${NAME} 2>&1 | awk -FState= '/^State=/ { print $2 }')"
 
 case "${CLEAN}" in
 	true)
 		# Removing overlay mounts
-		CNT_OVERLAY="$(awk -F= '/^cnt.overlay=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+		CNT_OVERLAY="$(awk -Fcnt.overlay= '/^cnt.overlay=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 		if [ -n "${CNT_OVERLAY}" ]
 		then
@@ -175,7 +175,7 @@ case "${CLEAN}" in
 		fi
 
 		# Removing rw bind mounts
-		BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+		BIND="$(awk -Fbind= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 		if [ -n "${BIND}" ]
 		then
@@ -190,7 +190,7 @@ case "${CLEAN}" in
 		fi
 
 		# Removing ro bind mounts
-		BIND_RO="$(awk -F= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+		BIND_RO="$(awk -Fbind-ro= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 		if [ -n "${BIND_RO}" ]
 		then
@@ -205,7 +205,7 @@ case "${CLEAN}" in
 		fi
 
 		# Removing network configuration
-		VETHS="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+		VETHS="$(awk -Fnetwork-veth-extra= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
 
 		case "${VETHS}" in
 			"")
@@ -257,7 +257,7 @@ machinectl ${MODE} ${NAME}
 
 case "${FORCE}" in
 	true)
-		VETHS="$(awk -F= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf | awk -F: '{ print $1 }')"
+		VETHS="$(awk -Fnetwork-veth-extra= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf | awk -F: '{ print $1 }')"
 
 		for VETH in ${VETHS}
 		do
diff --git a/share/config/container.conf.in b/share/config/container.conf.in
index ebf91b9..d930803 100644
--- a/share/config/container.conf.in
+++ b/share/config/container.conf.in
@@ -5,6 +5,7 @@ cnt.auto=@CNT_AUTO@
 cnt.container-server=@CNT_CONTAINER_SERVER@
 cnt.network-bridge=@CNT_NETWORK_BRIDGE@
 cnt.overlay=@CNT_OVERLAY@
+cnt.overlay-options=@CNT_OVERLAY_OPTIONS@
 bind=@BIND@
 bind-ro=@BIND_RO@
 boot=@BOOT@
diff --git a/share/man/container-create.1.txt b/share/man/container-create.1.txt
index 7770d9b..2ba95de 100644
--- a/share/man/container-create.1.txt
+++ b/share/man/container-create.1.txt
@@ -67,6 +67,9 @@ The following container-create options are available:
 *--cnt-overlay='DIRECTORY_LOWER:DIRECTORY_UPPER:DIRECTORY_WORK:DIRECTORY_MERGED[;DIRECTORY_UPPER:DIRECTORY_LOWER:DIRECTORY_WORK:DIRECTORY_MERGED]'*::
 	Specify container overlay mounts, see Documentation/filesystems/overlayfs.txt.
 
+*--cnt.overlay-options='OPTION1,OPTION2[;OPTION3,OPTION4]'*::
+	Specify container overlay mount options, see Documentation/filesystems/overlayfs.txt.
+
 
 SCRIPTS
 -------
diff --git a/share/scripts/debconf b/share/scripts/debconf
index 197791a..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
@@ -499,10 +517,14 @@ EOF
 	for PARENT_REPO in ${PARENT_ARCHIVES}
 	do
 		case "${PARENT_REPO}" in
-			${PARENT_DIST}-security)
+			buster-security)
 				echo "deb ${PARENT_MIRROR_SECURITY} ${PARENT_DIST}/updates ${PARENT_AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/debian.list"
 				;;
 
+			bullseye-security)
+				echo "deb ${PARENT_MIRROR_SECURITY} ${PARENT_DIST}-security ${PARENT_AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/debian.list"
+				;;
+
 			${PARENT_DIST}-updates)
 				echo "deb ${PARENT_MIRROR} ${PARENT_DIST}-updates ${PARENT_AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/debian.list"
 				;;
@@ -1014,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 c5925f2..dc2db47 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -53,18 +53,18 @@ Distribution ()
 	then
 		case "${MODE}" in
 			debian)
-				db_subst container/distribution CHOICES "Debian GNU/Linux 9 \"stretch\", Debian GNU/Linux 10 \"buster\", Debian GNU/Linux testing/bullseye, Debian GNU/Linux unstable/sid"
+				db_subst container/distribution CHOICES "Debian GNU/Linux 9 \"stretch\", Debian GNU/Linux 10 \"buster\", Debian GNU/Linux 11 \"bullseye\", Debian GNU/Linux unstable/sid"
 				db_subst container/distribution CHOICES_C "stretch, buster, bullseye, sid"
 
-				db_set container/distribution buster
+				db_set container/distribution bullseye
 				db_fset container/distribution seen false
 				;;
 
 			progress-linux)
-				db_subst container/distribution CHOICES "Progress Linux 5 (engywuck), Progress Linux 5+ (engywuck-backports)"
-				db_subst container/distribution CHOICES_C "engywuck, engywuck-backports"
+				db_subst container/distribution CHOICES "Progress Linux 5 (engywuck), Progress Linux 5+ (engywuck-backports), Progress Linux 6 (fuchur), Progress Linux 6+ (fuchur-backports)"
+				db_subst container/distribution CHOICES_C "engywuck, engywuck-backports, fuchur, fuchur-backports"
 
-				db_set container/distribution engywuck-backports
+				db_set container/distribution fuchur-backports
 				db_fset container/distribution seen false
 				;;
 		esac
@@ -94,6 +94,10 @@ Parent_distribution ()
 					engywuck*)
 						PARENT_DISTRIBUTION="buster"
 						;;
+
+					fuchur*)
+						PARENT_DISTRIBUTION="bullseye"
+						;;
 				esac
 				;;
 
@@ -1242,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
diff --git a/share/scripts/debootstrap b/share/scripts/debootstrap
index f69d006..0130b72 100755
--- a/share/scripts/debootstrap
+++ b/share/scripts/debootstrap
@@ -153,7 +153,7 @@ then
 fi
 
 ARCHITECTURE="${ARCHITECTURE:-$(dpkg --print-architecture)}"
-DISTRIBUTION="${DISTRIBUTION:-buster}"
+DISTRIBUTION="${DISTRIBUTION:-bullseye}"
 MIRROR="${MIRROR:-https://deb.debian.org/debian}"
 PASSWORD="${PASSWORD:-$(dd if=/dev/urandom bs=12 count=1 2> /dev/null | base64)}"