diff options
| author | Michael Brown | 2021-01-24 13:31:48 +0100 |
|---|---|---|
| committer | Michael Brown | 2021-01-24 13:31:48 +0100 |
| commit | 68469d1b12a8ef51b6c0f352342b700f7b7e4777 (patch) | |
| tree | 095abbc4c783dd721b1a30aceec502bcae28fe9a | |
| parent | [build] Check that mkisofs equivalent supports the required options (diff) | |
| download | ipxe-68469d1b12a8ef51b6c0f352342b700f7b7e4777.tar.gz ipxe-68469d1b12a8ef51b6c0f352342b700f7b7e4777.tar.xz ipxe-68469d1b12a8ef51b6c0f352342b700f7b7e4777.zip | |
[build] Report a meaningful error message if isolinux.bin is missing
Signed-off-by: Michael Brown <mcb30@ipxe.org>
| -rwxr-xr-x | src/util/genfsimg | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/util/genfsimg b/src/util/genfsimg index 9fc9b6869..345673460 100755 --- a/src/util/genfsimg +++ b/src/util/genfsimg @@ -105,9 +105,11 @@ copy_syslinux_file() { ; do if [ -e "${SRCDIR}/${FILENAME}" ] ; then cp "${SRCDIR}/${FILENAME}" "${DESTDIR}/" - break + return 0 fi done + echo "${0}: could not find ${FILENAME}" >&2 + return 1 } # Parse command-line options @@ -225,7 +227,7 @@ done if [ -n "${ISOIMG}" ] ; then ISOARGS="-J -R" copy_syslinux_file "isolinux.bin" "${ISODIR}" - copy_syslinux_file "ldlinux.c32" "${ISODIR}" || true + copy_syslinux_file "ldlinux.c32" "${ISODIR}" 2>/dev/null || true ISOARGS="${ISOARGS} -no-emul-boot -eltorito-boot isolinux.bin" ISOARGS="${ISOARGS} -boot-load-size 4 -boot-info-table" if [ -n "${EFI}" ] ; then |