[SCM] live-helper branch, debian-next, updated. debian/2.0_a14-1-6-g80c8929

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 80c8929707419778228224aafc5d3a3f4bf7f2b0
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jun 16 16:09:10 2010 +0200

    Temporarily removing grub2 from d-i packages again, needs some fixes first.

diff --git a/helpers/binary_debian-installer b/helpers/binary_debian-installer
index 20be911..32a8278 100755
--- a/helpers/binary_debian-installer
+++ b/helpers/binary_debian-installer
@@ -322,7 +322,8 @@ then
 
 	case "${LH_ARCHITECTURE}" in
 		amd64)
-			DI_REQ_PACKAGES="lilo grub grub2"
+			#DI_REQ_PACKAGES="lilo grub grub2"
+			DI_REQ_PACKAGES="lilo grub"
 
 			case "${LH_MODE}" in
 				ubuntu)
@@ -336,7 +337,8 @@ then
 			;;
 
 		i386)
-			DI_REQ_PACKAGES="elilo lilo grub grub2"
+			#DI_REQ_PACKAGES="elilo lilo grub grub2"
+			DI_REQ_PACKAGES="elilo lilo grub"
 
 			case "${LH_MODE}" in
 				ubuntu)

-- 
live-helper