diff options
author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-01-04 21:16:36 +0100 |
---|---|---|
committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-01-04 21:47:53 +0100 |
commit | ec9bd07c900e13d606445518a87e0326902d5815 (patch) | |
tree | 6736b5528d0fb5024a2fc66557e1d7f091d81949 /components/9990-overlay.sh | |
parent | 44e7b72fa71425b02ec770b1f3429b27a5cf6c51 (diff) | |
download | live-boot-ec9bd07c900e13d606445518a87e0326902d5815.tar.gz live-boot-ec9bd07c900e13d606445518a87e0326902d5815.zip |
Dropping unionfs-fuse support:
* unionfs-fuse itself has been always very buggy for us.
* unionfs-fuse code in live-boot as been experimental at best.
* the FUSE implementation is horribly slow due to the nature of
FUSE (~10min to boot a live system with unionfs-fuse compared
to <<1min with aufs).
* and last but not least, there's overlay in kernel mainline now.
Diffstat (limited to 'components/9990-overlay.sh')
-rwxr-xr-x | components/9990-overlay.sh | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh index e22b905..9d26934 100755 --- a/components/9990-overlay.sh +++ b/components/9990-overlay.sh @@ -10,21 +10,12 @@ setup_unionfs () case ${UNIONTYPE} in aufs|unionfs|overlay) - modprobe -q -b ${UNIONTYPE} - - if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" && [ -x /bin/unionfs-fuse ] + if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" then - echo "${UNIONTYPE} not available, falling back to unionfs-fuse." - echo "This might be really slow." - - UNIONTYPE="unionfs-fuse" + panic "${UNIONTYPE} not available." fi - ;; - esac - case "${UNIONTYPE}" in - unionfs-fuse) - modprobe fuse + modprobe -q -b ${UNIONTYPE} ;; esac @@ -358,15 +349,7 @@ setup_unionfs () # do nothing # mount -o bind "${d}" "${live_rootfs}" ;; *) - case "${UNIONTYPE}" in - unionfs-fuse) - mount -o bind "${d}" "${live_rootfs}" - ;; - - *) - mount -o move "${d}" "${live_rootfs}" - ;; - esac + mount -o move "${d}" "${live_rootfs}" ;; esac done |