Merge branch 'debian-old-2.0' into burg

3 files changed, 24 insertions, 44 deletions

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index ee7bb64..f6769cf 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -231,36 +231,7 @@ then
 	LB_DEBIAN_INSTALLER_DISTRIBUTION="sid"
 
 	# Debian Installer daily builds
-	case "${LB_ARCHITECTURE}" in
-		alpha|amd64|hppa|ia64|mips|mipsel|powerpc)
-			URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURE}/daily/"
-			;;
-
-		arm|armel)
-			URL="http://people.debian.org/~kmuto/d-i/images/daily/"
-			;;
-
-		i386)
-			URL="http://people.debian.org/~joeyh/d-i/images/daily/"
-			;;
-
-		m68k)
-			URL="http://people.debian.org/~smarenka/d-i/images-m68k/daily/"
-			;;
-
-		s390)
-			URL="http://lophos.multibuild.org/d-i/images/daily/"
-			;;
-
-		sparc)
-			URL="http://people.debian.org/~stappers/d-i/images/daily/"
-			;;
-
-		*)
-			Echo_error "No daily-builds found for your architecture."
-			exit 1
-			;;
-	esac
+	URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURE}/daily/"
 else
 	URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURE}/current/images/"
 fi
@@ -323,8 +294,7 @@ then
 
 	case "${LB_ARCHITECTURE}" in
 		amd64)
-			#DI_REQ_PACKAGES="lilo grub grub2"
-			DI_REQ_PACKAGES="lilo grub"
+			DI_REQ_PACKAGES="lilo grub grub-pc"
 
 			case "${LB_MODE}" in
 				ubuntu)
@@ -338,8 +308,7 @@ then
 			;;
 
 		i386)
-			#DI_REQ_PACKAGES="elilo lilo grub grub2"
-			DI_REQ_PACKAGES="elilo lilo grub"
+			DI_REQ_PACKAGES="elilo lilo grub grub-pc"
 
 			case "${LB_MODE}" in
 				ubuntu)
@@ -379,7 +348,7 @@ then
 			;;
 	esac
 
-	DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup lvm2"
+	DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup mdadm lvm2"
 
 	case "${LB_MODE}" in
 		debian)
diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk
index fe68a7d..c976cd5 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/lb_binary_disk
@@ -123,14 +123,13 @@ case "${LB_DEBIAN_INSTALLER}" in
 
 		touch binary/.disk/base_installable
 
-		echo "not_complete" > binary/.disk/cd_type
-
 		if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
 		then
+			echo "live" > binary/.disk/cd_type
 			echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/INSTALL Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
 		else
+			echo "not_complete" > binary/.disk/cd_type
 			echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
-
 		fi
 
 		cp "${LB_BASE}"/data/debian-cd/${LB_DISTRIBUTION}/${LB_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include
diff --git a/scripts/build/lb_binary_usb b/scripts/build/lb_binary_usb
index 51e6ca7..8a168c3 100755
--- a/scripts/build/lb_binary_usb
+++ b/scripts/build/lb_binary_usb
@@ -190,16 +190,10 @@ esac
 case "${LB_BUILD_WITH_CHROOT}" in
 	true)
 		Chroot chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}"
-
-		Chroot chroot "parted -s ${FREELO} set 1 boot on" || true
-		Chroot chroot "parted -s ${FREELO} set 1 lba off" || true
 		;;
 
 	false)
 		mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}
-
-		parted -s ${FREELO} set 1 boot on || true
-		parted -s ${FREELO} set 1 lba off || true
 		;;
 esac
 
@@ -265,6 +259,24 @@ ${LB_LOSETUP} -d ${FREELO}
 
 echo "!!! The above error/warning messages can be ignored !!!"
 
+FREELO="$(${LB_LOSETUP} -f)"
+Losetup "${FREELO}" chroot/binary.img 0
+
+case "${LB_BUILD_WITH_CHROOT}" in
+	true)
+		Chroot chroot "parted -s ${FREELO} set 1 boot on" || true
+		Chroot chroot "parted -s ${FREELO} set 1 lba off" || true
+		;;
+
+	false)
+		parted -s "${FREELO}" set 1 boot on || true
+		parted -s "${FREELO}" set 1 lba off || true
+		;;
+esac
+
+sleep 1
+${LB_LOSETUP} -d ${FREELO}
+
 if [ -n "${MAKEDEV}" ]
 then
 	rm -rf chroot/dev