Bug#750586: Bug#756275: debian-installer: [PATCH] Fix lib location and search path for syslinux >= 5

[Chris Kuehl <ckuehl@ocf.berkeley.edu>]

Hi all,

Thanks for your work on this -- we're also experiencing this bug in both
jessie and sid daily netboot images in our PXE boot environment.

On Thu, Aug 07, 2014 at 01:46:06PM +0200, Cyril Brulebois wrote:
> I could apply it blindly but it'd be nice if someone else would confirm
> it works fine. I've got other things cooking, but I might end up testing
> it myself it nobody steps up.

I might be building the image wrong, but after applying Ron's patch, I
get a symlink like the following in my netboot tarball:

ldlinux.c32 -> debian-installer/amd64/debian-installer/amd64/boot-screens//ldlinux.c32

Note that ``d-i/$arch'' is duplicated, and there is an extra slash
before ``ldlinux.c32''.

During my build, the relevant vars were:

    NETBOOT_PATH=debian-installer/amd64
    BOOT_SCREEN_DIR=debian-installer/amd64/boot-screens/

I've attached a small patch (intended to be applied after Ron's) which
fixes the target path of the symlink on my sid build.

With these two patches applied, the sid netboot image boots and installs
successfully in our environment. I'd be more than happy to help test any
additional work on this issue.

Thanks!
Chris

>From 89f74fdc2893a68d2baba8d13cff4846d92840e8 Mon Sep 17 00:00:00 2001
From: Chris Kuehl <ckuehl@ocf.berkeley.edu>
Date: Sat, 20 Sep 2014 21:00:11 +0000
Subject: [PATCH] Fix ldlinux.c32 symlink path

The existing symlink creates a target path like:
debian-installer/amd64/debian-installer/amd64/boot-screens//ldlinux.c32

(note the duplicate of "d-i/amd64/" and the double slash after boot-screens)
---
 build/config/x86.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/config/x86.cfg b/build/config/x86.cfg
index 07f99b8..0bcd2a9 100644
--- a/build/config/x86.cfg
+++ b/build/config/x86.cfg
@@ -393,7 +393,7 @@ arch_netboot_dir: x86_syslinux
 	ln -sf $(NETBOOT_PATH)/pxelinux.0 $(TEMP_NETBOOT_DIR)/pxelinux.0
 	# This link is required because pxelinux only looks in the tftp root
 	# for this library (it does a PATH search for any others).
-	ln -sf $(NETBOOT_PATH)/$(BOOT_SCREEN_DIR)/ldlinux.c32 $(TEMP_NETBOOT_DIR)/ldlinux.c32
+	ln -sf $(BOOT_SCREEN_DIR)ldlinux.c32 $(TEMP_NETBOOT_DIR)/ldlinux.c32
 
 	set -e; \
 	$(foreach file,$(wildcard $(TEMP_BOOT_SCREENS)/*.txt), \
-- 
2.1.0