Commit 94de28de authored by Tails developers's avatar Tails developers Committed by Daniel Baumann

Patch by Steven Shiau <steven@nchc.org.tw>. The only changes so far are:

 * drop the parts of the patch that are not relevant to live-boot 5.x
 * adapt formatting to match Debian Live coding standards
parent b6c5221a
......@@ -1313,13 +1313,20 @@ 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}/rw,workdir=${unionrw}/work"
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
;;
esac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment