Skip to content

Commit

Permalink
Removing attempt to mount overlayfs in an obsolete way.
Browse files Browse the repository at this point in the history
The version of overlayfs that reached Linux mainline does not support
this mount call, no need to try it every time.
  • Loading branch information
Tails developers authored and daniel-baumann committed May 17, 2015
1 parent 94de28d commit aebd12f
Showing 1 changed file with 10 additions and 13 deletions.
23 changes: 10 additions & 13 deletions components/9990-misc-helpers.sh
Expand Up @@ -1314,19 +1314,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

Expand Down

0 comments on commit aebd12f

Please sign in to comment.