diff options
| author | Michael Brown | 2015-09-01 21:58:28 +0200 |
|---|---|---|
| committer | Michael Brown | 2015-09-01 22:04:44 +0200 |
| commit | f6e1da5cbf70a372f2b622c8021c98503cab8323 (patch) | |
| tree | 310d4800cd9d248a81f976a8ce21b1fb4416cb3c /src/util | |
| parent | [efi] Populate debug directory entry FileOffset field (diff) | |
| download | ipxe-f6e1da5cbf70a372f2b622c8021c98503cab8323.tar.gz ipxe-f6e1da5cbf70a372f2b622c8021c98503cab8323.tar.xz ipxe-f6e1da5cbf70a372f2b622c8021c98503cab8323.zip | |
[build] Search for ldlinux.c32 separately from isolinux.bin
Some distributions (observed with Ubuntu 15.04) place ldlinux.c32 in a
separate directory from isolinux.bin. Search for these files
separately, and allow an alternative location of ldlinux.c32 to be
provided via LDLINUX_C32=... on the make command line.
Reported-by: Adrian Koshka <adriankoshcha@teknik.io>
Tested-by: Adrian Koshka <adriankoshcha@teknik.io>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/util')
| -rwxr-xr-x | src/util/geniso | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/util/geniso b/src/util/geniso index 521c929e..ff090d4a 100755 --- a/src/util/geniso +++ b/src/util/geniso @@ -123,8 +123,7 @@ case "${LEGACY}" in cp ${ISOLINUX_BIN} ${dir} # syslinux 6.x needs a file called ldlinux.c32 - LDLINUX_C32=$(dirname ${ISOLINUX_BIN})/ldlinux.c32 - if [ -s ${LDLINUX_C32} ]; then + if [ -n "${LDLINUX_C32}" -a -s "${LDLINUX_C32}" ]; then cp ${LDLINUX_C32} ${dir} fi |