diff options
| author | Tails developers <amnesia@boum.org> | 2015-02-15 17:26:47 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-04-28 06:53:28 +0200 |
| commit | 289f0d924b6fa009790b4a67164892107a5a4086 (patch) | |
| tree | 917489ad1bf19d37697218b9b6628929ef9aab2c | |
| parent | d1d4af9b25661d047a3c5a739b5d1e991a863d88 (diff) | |
| download | live-boot-289f0d924b6fa009790b4a67164892107a5a4086.tar.gz live-boot-289f0d924b6fa009790b4a67164892107a5a4086.zip | |
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.
| -rwxr-xr-x | components/9990-misc-helpers.sh | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 315e3b1..5439e73 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -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 } |