X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-overlay.sh;h=9d26934d3949dbca2da99fb53cda6c7fbd732c9e;hb=ec9bd07c;hp=52c045a4ce4cdaf6e9220be47ffe2ed57a0f573a;hpb=28ca8298a10702e391e420975205a98450d4cf7d;p=live-boot-grml.git diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh index 52c045a..9d26934 100755 --- a/components/9990-overlay.sh +++ b/components/9990-overlay.sh @@ -9,22 +9,13 @@ setup_unionfs () addimage_directory="${3}" case ${UNIONTYPE} in - aufs|unionfs|overlayfs) - modprobe -q -b ${UNIONTYPE} - - if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" && [ -x /bin/unionfs-fuse ] + aufs|unionfs|overlay) + 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