X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-misc-helpers.sh;h=25d6fd7241ae5ec33f5fae362e7eacec5f89e0cd;hb=aebd12f70f50d59c2f7afe1923087e3c61dce3c1;hp=4815553894272ae5d235bd0237e2b519381d535d;hpb=c5b6cb0b238bc8230a9366abafa73752dc093d27;p=live-boot-grml.git

diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index 4815553..25d6fd7 100755
--- a/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@ -1301,7 +1301,6 @@ do_union ()
 					unionmountopts="${unionmountopts}:${rofs}=${ro_opt}"
 				done
 			fi
-			mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
 			;;
 
 		overlay)
@@ -1314,16 +1313,21 @@ do_union ()
 			then
 				panic "overlay needs at least one lower filesystem (read-only branch)."
 			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}"
+			# 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}"
 			;;
 	esac
+
+	mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
 }
 
 get_custom_mounts ()