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

diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index 87c4930..e58f283 100755
--- a/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@ -1301,13 +1301,9 @@ do_union ()
 					unionmountopts="${unionmountopts}:${rofs}=${ro_opt}"
 				done
 			fi
-			mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
 			;;
 
 		overlay)
-			rw_opt="rw"
-			ro_opt="ro"
-
 			# XXX: can multiple unionro be used? (overlay only handles two dirs, but perhaps they can be chained?)
 			# XXX: and can unionro be optional? i.e. can overlay skip lowerdir?
 			if echo ${unionro} | grep -q " "
@@ -1318,9 +1314,23 @@ 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
+
+	mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
 }
 
 get_custom_mounts ()