[SCM] live-boot branch, debian-next, updated. debian/2.0_a6-1-2-ga4044cf

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit a4044cfd961dd6a0f8c654456ebccb0fbd6ad67f
Author: Michal Suchanek <hramrach at centrum.cz>
Date:   Tue Jun 8 15:05:07 2010 +0200

    Really set NETBOOT with iSCSI.

diff --git a/scripts/live b/scripts/live
index 2e40b45..6f04b86 100755
--- a/scripts/live
+++ b/scripts/live
@@ -757,6 +757,8 @@ do_iscsi()
 		do
 			if check_dev "null" "/dev/$dev"
 			then
+				NETBOOT="iscsi"
+				export NETBOOT
 				return 0;
 			fi
 		done
@@ -764,8 +766,6 @@ do_iscsi()
 	else
 		panic "Failed to locate iSCSI host in /sys"
 	fi
-	NETBOOT="iscsi"
-	export NETBOOT
 }
 
 do_httpmount ()

-- 
live-boot