X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2F9990-mount-http.sh;h=16e69b692e04ac178e016591a5f7fe6c8cfbffc9;hb=56eb0235b604c23e6220e6e618b59a5ef0a4115c;hp=1b718c0a841c4fa8ab1dc0c0a00321659bc11724;hpb=2e70d7be610c9e45787c37352d36241de3c155d7;p=live-boot-grml.git

diff --git a/scripts/boot/9990-mount-http.sh b/scripts/boot/9990-mount-http.sh
index 1b718c0..16e69b6 100755
--- 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
@@ -31,8 +32,8 @@ do_httpmount ()
 								ip="$(dirname $url | sed -e 's|tftp://||g' -e 's|/.*$||g')"
 								rfile="$(echo $url | sed -e "s|tftp://$ip||g")"
 								lfile="$(basename $url)"
-								log_begin_msg "Trying tftp -g -b 10240 -r $rfile -l ${dest}/$lfile $ip"
-								tftp -g -b 10240 -r $rfile -l ${dest}/$lfile $ip
+								log_begin_msg "Trying tftp -g -b 65464 -r $rfile -l ${dest}/$lfile $ip"
+								tftp -g -b 65464 -r $rfile -l ${dest}/$lfile $ip
 							;;
 
 							*)
@@ -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" ; } )"