X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=d3c86a20427126cd5beb6f84a47f72e654d2aab7;hb=046580edb4877fc1a4a823e882a0949fbc729544;hp=2cfa5e199a1c54731aae12bc80bce5260086b0c0;hpb=9fce4d8ed2f15757322c68625de3398566a69f44;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 2cfa5e1..d3c86a2 100755
--- a/scripts/live
+++ b/scripts/live
@@ -561,6 +561,9 @@ is_nice_device ()
 	if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-[ide|scsi|usb])"
 	then
 		return 0
+	elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
+	then
+		return 0
 	fi
 
 	return 1
@@ -719,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})"
@@ -1109,6 +1123,7 @@ setup_unionfs ()
 	else
 		cowdevice="tmpfs"
 		cow_fstype="tmpfs"
+		cow_mountopt="rw,noatime,mode=755"
 	fi
 
 	if [ "${cow_fstype}" = "nfs" ]
@@ -1118,8 +1133,6 @@ setup_unionfs ()
 		nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
 			panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
 	else
-		# make sure cow_mountopt is set:
-		[ -n "$cow_mountopt" ] || cow_mountopt="rw,noatime,mode=755"
 		mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
 			panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
 	fi