diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-01-04 21:09:04 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-01-04 21:47:53 +0100 |
| commit | 44e7b72fa71425b02ec770b1f3429b27a5cf6c51 (patch) | |
| tree | f3b246cfc5575f1dba56e679512c00cfde843a26 | |
| parent | 20a36dd1e76d50c02968a50212a59c34efb3e79a (diff) | |
| download | live-boot-44e7b72fa71425b02ec770b1f3429b27a5cf6c51.tar.gz live-boot-44e7b72fa71425b02ec770b1f3429b27a5cf6c51.zip | |
Using 'overlay' instead of 'overlayfs' everywhere, without backwards compatibility (Closes: #773881).
When overlayfs got merged into kernel mainline it was
renamed to overlay. We don't provide backwards compatibility
since overlayfs support was experimental and only with
non-debian default kernels available.
| -rwxr-xr-x | backend/initramfs-tools/live.hook | 2 | ||||
| -rwxr-xr-x | components/9990-misc-helpers.sh | 10 | ||||
| -rwxr-xr-x | components/9990-overlay.sh | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook index f48cb5a..234f334 100755 --- a/backend/initramfs-tools/live.hook +++ b/backend/initramfs-tools/live.hook @@ -105,7 +105,7 @@ manual_add_modules squashfs manual_add_modules sqlzma manual_add_modules unlzma -# Filesystem: aufs/overlayfs/unionfs +# Filesystem: aufs/overlay/unionfs manual_add_modules aufs manual_add_modules overlay manual_add_modules unionfs diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index fb139ec..70f907a 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1322,15 +1322,15 @@ do_union () pidof unionfs-fuse >> /run/sendsigs.omit.d/unionfs-fuse || true ) ;; - overlayfs) - # XXX: can multiple unionro be used? (overlayfs only handles two dirs, but perhaps they can be chained?) - # XXX: and can unionro be optional? i.e. can overlayfs skip lowerdir? + overlay) + # XXX: can multiple unionro be used? (overlay only handles two dirs, but perhaps they can be chained?) + # XXX: and can unionro be optional? i.e. can overlay skip lowerdir? if echo ${unionro} | grep -q " " then - panic "Multiple lower filesystems are currently not supported with overlayfs (unionro = ${unionro})." + panic "Multiple lower filesystems are currently not supported with overlay (unionro = ${unionro})." elif [ -z "${unionro}" ] then - panic "Overlayfs needs at least one lower filesystem (read-only branch)." + panic "overlay needs at least one lower filesystem (read-only branch)." fi unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}" mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh index 52c045a..e22b905 100755 --- a/components/9990-overlay.sh +++ b/components/9990-overlay.sh @@ -9,7 +9,7 @@ setup_unionfs () addimage_directory="${3}" case ${UNIONTYPE} in - aufs|unionfs|overlayfs) + aufs|unionfs|overlay) modprobe -q -b ${UNIONTYPE} if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" && [ -x /bin/unionfs-fuse ] |