[ipxe-devel] [PATCH 1/2] bash -e instead of just bash

Geert Stappers stappers at stappers.nl
Tue Apr 28 20:18:32 UTC 2020


From: Geert Stappers <stappers at stappers.nl>

When you try to build an iso but isolinux is not installed
an almost-empty is generated, which does not work.

Report-by: GrumpyFux
---
 src/arch/x86/Makefile.pcbios | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/arch/x86/Makefile.pcbios b/src/arch/x86/Makefile.pcbios
index c44eefc1..7ffd6e69 100644
--- a/src/arch/x86/Makefile.pcbios
+++ b/src/arch/x86/Makefile.pcbios
@@ -84,19 +84,19 @@ NON_AUTO_MEDIA	+= iso
 %iso:	%lkrn util/geniso
 	$(QM)$(ECHO) "  [GENISO] $@"
 	$(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) LDLINUX_C32=$(LDLINUX_C32) \
-	    VERSION="$(VERSION)" bash util/geniso -o $@ $<
+	    VERSION="$(VERSION)" bash -e util/geniso -o $@ $<
 
 # rule to make a floppy emulation ISO boot image
 NON_AUTO_MEDIA	+= liso
 %liso:	%lkrn util/geniso
 	$(QM)$(ECHO) "  [GENISO] $@"
-	$(Q)VERSION="$(VERSION)" bash util/geniso -l -o $@ $<
+	$(Q)VERSION="$(VERSION)" bash -e util/geniso -l -o $@ $<
 
 # rule to make a syslinux floppy image (mountable, bootable)
 NON_AUTO_MEDIA	+= sdsk
 %sdsk:	%lkrn util/gensdsk
 	$(QM)$(ECHO) "  [GENSDSK] $@"
-	$(Q)bash util/gensdsk $@ $<
+	$(Q)bash -e util/gensdsk $@ $<
 
 # rule to write disk images to /dev/fd0
 NON_AUTO_MEDIA	+= fd0
-- 
2.25.1




More information about the ipxe-devel mailing list