[SCM] live-build branch, debian, updated. debian/2.0_a1-1-379-ge94391a

Daniel Baumann daniel at debian.org
Mon Sep 27 05:55:13 UTC 2010


The following commit has been merged in the debian branch:
commit bc502cb2bcc721a462d53aa9cbbbe1ed773b6752
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Sep 26 16:40:05 2010 +0200

    Removing d-i hacks, should be fixed with newer live-installer.

diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index c0052da..a3d85a2 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -213,31 +213,6 @@ then
 	# This is a temporary hack to get rid of fstab;
 	# needs cleanup in live-initramfs first to proper fix.
 	rm -f chroot/etc/fstab
-
-	# There is a timing issue somewhere when using live-installer
-	# and the apt-get update waypoint: At the time when we're installing
-	# bootloader, it tries to fetch them from the net but the e.g.
-	# 'chroot /target apt-get install grub' fails because of missing
-	# packages lists. As a very cheap workaround, we ensure that the
-	# bootloader is already installed in the image. Very ugly, but it's to
-	# late to fix it in d-i because lenny rc2 has been already released.
-	case "${LB_ARCHITECTURE}" in
-		amd64|i386)
-			case "${LB_BOOTLOADER}" in
-				grub)
-					Apt install grub
-					;;
-
-				grub2)
-					Apt install grub2
-					;;
-			esac
-			;;
-
-		powerpc)
-			Apt install yaboot
-			;;
-	esac
 fi
 
 if [ "${LB_EXPOSED_ROOT}" = "true" ]

-- 
live-build



More information about the debian-live-changes mailing list