Adding upstream version 4.0~a12.

[live-boot-grml.git] / scripts / boot / 9990-mount-http.sh

diff --git a/scripts/boot/9990-mount-http.sh b/scripts/boot/9990-mount-http.sh
index 1b718c0..9c01482 100755 (executable)
--- a/scripts/boot/9990-mount-http.sh
+++ b/scripts/boot/9990-mount-http.sh
@@ -8,8 +8,9 @@ do_httpmount ()
 
        for webfile in HTTPFS FTPFS FETCH
        do
-               local url="$(eval echo \"\$\{${webfile}\}\")"
-               local extension="$(echo "${url}" | sed 's/\(.*\)\.\(.*\)/\2/')"
+               local url extension dest
+               url="$(eval echo \"\$\{${webfile}\}\")"
+               extension="$(echo "${url}" | sed 's/\(.*\)\.\(.*\)/\2/')"
 
                if [ -n "$url" ]
                then
@@ -20,7 +21,7 @@ do_httpmount ()
                                                mkdir -p "${alt_mountpoint}"
                                                dest="${alt_mountpoint}"
                                        else
-                                               local dest="${mountpoint}/${LIVE_MEDIA_PATH}"
+                                               dest="${mountpoint}/${LIVE_MEDIA_PATH}"
                                                mount -t ramfs ram "${mountpoint}"
                                                mkdir -p "${dest}"
                                        fi
@@ -49,6 +50,13 @@ do_httpmount ()
                                                else
                                                        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" ; } )"