X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=683afa2a8b2e924868c050ac889a37dc11d063dc;hb=371b63f7dae515c56b777b2c2dca5135dd67781d;hp=56c0a1413cdea47a7ba63d4dadcd8db2f6e04e1b;hpb=21d3e4a63bd9ee65a54f91bb58f9d30460eb7dd0;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 56c0a14..683afa2 100755
--- a/scripts/live
+++ b/scripts/live
@@ -773,9 +773,11 @@ do_httpmount ()
 					then
 						case "$url" in
 							tftp*)
-								ip="$(dirname $url | sed -e 's|tftp://||g')"
-								log_begin_msg "Trying tftp -g -b 10240 -r $(basename ${url})  -l ${dest}/$(basename ${url}) $ip"
-								tftp -g -b 10240 -r $(basename ${url})  -l ${dest}/$(basename ${url}) $ip
+								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
 							;;
 
 							*)
@@ -983,12 +985,11 @@ try_snap ()
 			log_warning_msg "Impossible to include the ${snapfile} Snapshot file"
 		fi
 
-
 	elif [ -b "${snapdata}" ]
 	then
 		# Try to find if it could be a snapshot partition
 		dev="${snapdata}"
-		log_success_msg "found snapshot device on ${dev}"
+		log_success_msg "found snapshot ${snap_type} device on ${dev}"
 		if echo "${dev}" | grep -qs loop
 		then
 			# strange things happens, user confused?