X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-misc-helpers.sh;h=c59e40e5523b7e1b02eb9d5c6be408b27b81b521;hb=822706beb66f72389dc5e9328b52f1a9c0da04fe;hp=e58f283cda8cd7dc5e1b56410852cac9d6d978eb;hpb=94de28deace2c7c3df13790f326f9206d5fe898e;p=live-boot-grml.git

diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index e58f283..c59e40e 100755
--- a/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@ -1314,19 +1314,14 @@ do_union ()
 				panic "overlay needs at least one lower filesystem (read-only branch)."
 			fi
 			unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}"
-			if ! mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" 2>/dev/null
-			then
-				# Ref: kiwi from OpenSuse kiwi-7.02.18-1.1
-				# overlayfs in version >= v22 behaves differently
-				# + renamed from overlayfs to overlay
-				# + requires a workdir to become mounted
-				# + requires workdir and upperdir to reside under the same mount
-				# + requires workdir and upperdir to be in separate subdirs
-				mkdir ${unionrw}/rw
-				mkdir ${unionrw}/work
-				unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work"
-				mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
-			fi
+			# overlayfs requires:
+			# + a workdir to become mounted
+			# + workdir and upperdir to reside under the same mount
+			# + workdir and upperdir to be in separate directories
+			mkdir ${unionrw}/rw
+			mkdir ${unionrw}/work
+			unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work"
+			mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
 			;;
 	esac