X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-mount-http.sh;h=f58c3a32ac2a7c9f07cff72c27e581fc942b9a05;hb=683095685ccdd4175b75293540aabe239d03a6bb;hp=16e69b692e04ac178e016591a5f7fe6c8cfbffc9;hpb=a331218718282c5496ff062a0f6aa55908224862;p=live-boot-grml.git diff --git a/components/9990-mount-http.sh b/components/9990-mount-http.sh index 16e69b6..f58c3a3 100755 --- a/components/9990-mount-http.sh +++ b/components/9990-mount-http.sh @@ -25,6 +25,9 @@ do_httpmount () mount -t ramfs ram "${mountpoint}" mkdir -p "${dest}" fi + case "${url}" in + *:///*) url="${url%%:///*}://${ROOTSERVER}/${url##*:///}" ;; + esac if [ "${webfile}" = "FETCH" ] then case "$url" in @@ -51,12 +54,6 @@ do_httpmount () FUSE_MOUNT="httpfs" fi - if [ -n "${FUSE_MOUNT}" ] && [ -x /bin/mount.util-linux ] - then - # fuse does not work with klibc mount - ln -f /bin/mount.util-linux /bin/mount - fi - modprobe fuse $FUSE_MOUNT "${url}" "${dest}" ROOT_PID="$(minips h -C "$FUSE_MOUNT" | { read x y ; echo "$x" ; } )" @@ -83,7 +80,7 @@ do_httpmount () then if [ -d "${alt_mountpoint}" ] then - umount "${alt_mountpoint}" + umount "${alt_mountpoint}" rmdir "${alt_mountpoint}" fi umount "${mountpoint}"