X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-overlay.sh;h=d293eadbbba73dbc7bab9772a3923a0e54c0a632;hb=ad63444c66cae26ee32136f9073aa5fc9cf04690;hp=e22b90567172b80767b134cfd3c1e3d85265cdf5;hpb=44e7b72fa71425b02ec770b1f3429b27a5cf6c51;p=live-boot-grml.git diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh index e22b905..d293ead 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|overlay) - modprobe -q -b ${UNIONTYPE} - - if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" && [ -x /bin/unionfs-fuse ] + aufs|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