[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#773833: Syslinux mbr location still not fixed / backport to 4.0 / jessie?



Hi,

this bug is marked as fixed in 5.0~a3, but I can't find the commit that
fixes it? Looking at the git master version, it seems this is still
broken as well?

http://live.debian.net/gitweb/?p=live-build.git;a=blob;f=scripts/build/binary_hdd;h=f5d42068110b9f3b19bc456a1c460046466957e9;hb=HEAD#l173


Furthermore, are there any plans to backport this fix to Jessie / 4.0?
Right now, the Jessie version is simply broken for hdd images. If this
is the plan, I've attached a patch against 4.0.5 that fixes this, as
well as another issue with hdd images and LB_BUILD_WITH_CHROOT=false.

This is the same patch I linked on IRC yesterday, but this is probably a
better place to
keep it.

Gr.

Matthijs
diff -ru build.orig/binary_hdd build/binary_hdd
--- build.orig/binary_hdd	2015-05-28 17:47:16.751149941 +0200
+++ build/binary_hdd	2015-05-28 18:38:25.448557872 +0200
@@ -191,7 +191,7 @@
 
 		if [ "${LB_BOOTLOADER}" = "syslinux" ]
 		then
-			dd if=chroot/usr/lib/${_BOOTLOADER}/mbr.bin of=${FREELO} bs=440 count=1
+			dd if=chroot/usr/lib/${_BOOTLOADER}/mbr/mbr.bin of=${FREELO} bs=440 count=1
 		fi
 		;;
 
@@ -203,7 +203,7 @@
 
 		if [ "${LB_BOOTLOADER}" = "syslinux" ]
 		then
-			dd if=/usr/lib/${_BOOTLOADER}/mbr.bin of=${FREELO} bs=440 count=1
+			dd if=/usr/lib/${_BOOTLOADER}/mbr/mbr.bin of=${FREELO} bs=440 count=1
 		fi
 		;;
 esac
diff -ru build.orig/binary_syslinux build/binary_syslinux
--- build.orig/binary_syslinux	2015-05-28 17:47:16.751149941 +0200
+++ build/binary_syslinux	2015-05-28 18:41:06.211358157 +0200
@@ -180,9 +180,9 @@
 				;;
 
 			*)
-				if [ ! -e "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])" ]
+				if [ ! -e "/usr/lib/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])" ]
 				then
-					Echo_error "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])"
+					Echo_error "/usr/lib/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) - no such directory"
 					exit 1
 				fi
 				;;

Attachment: signature.asc
Description: Digital signature


Reply to: