Commit 289f0d92 authored by Tails developers's avatar Tails developers Committed by Daniel Baumann

Removing attempt to mount overlayfs in an obsolete way.

The version of overlayfs that reached Linux mainline does not support
this mount call, no need to try it every time.
parent d1d4af9b
......@@ -1318,19 +1318,16 @@ 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
# 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
}
......
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