X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=blobdiff_plain;f=components%2F9990-misc-helpers.sh;h=315e3b16d9a23fb692ce70c515e53f94b7f021c1;hp=87c49309721ad79d14b2a4b1d05e334d64295b0e;hb=d1d4af9b25661d047a3c5a739b5d1e991a863d88;hpb=8bb7633a1b25fd465d015119d6f15a159f68b8dd

diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index 87c4930..315e3b1 100755
--- a/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@ -1318,7 +1318,19 @@ do_union ()
 				panic "overlay needs at least one lower filesystem (read-only branch)."
 			fi
 			unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}"
-			mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
+			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
 			;;
 	esac
 }