[SCM] debian-live branch, master, updated. debian/1.136.3-1-12-gd0f1544

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 98e3faf81c9532faa14b2713f8ea9ce752e0d395
Author: Steven Shiau <steven at nchc.org.tw>
Date:   Fri Aug 8 16:09:34 2008 +0200

    Adding support for using tftp in fetch= parameter.

diff --git a/scripts/live b/scripts/live
index 54b43fb..d3c86a2 100755
--- a/scripts/live
+++ b/scripts/live
@@ -722,9 +722,20 @@ do_httpmount ()
 				squashfs|tgz|tar)
 					if [ "${webfile}" = "FETCH" ]
 					then
-						[ "${quiet}" != "y" ] &&
-							log_begin_msg "Trying wget ${url} -O ${dest}/$(basename ${url})"
-						wget "${url}" -O "${dest}/$(basename ${url})"
+						case "$url" in
+							tftp*)
+								ip="$(dirname $url | sed -e 's|tftp://||g')"
+								[ "${quiet}" != "y" ] &&
+								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
+							;;
+
+							*)
+								[ "${quiet}" != "y" ] &&
+								log_begin_msg "Trying wget ${url} -O ${dest}/$(basename ${url})"
+								wget "${url}" -O "${dest}/$(basename ${url})"
+								;;
+						esac
 					else
 						[ "${quiet}" != "y" ] &&
 							log_begin_msg "Trying to mount ${url} on ${dest}/$(basename ${url})"

-- 
debian-live