narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge dd68e283f8 into 7e64e9b670

pull/992/merge
Michael Brown 2025-04-05 17:37:45 +11:00 committed by GitHub
parent 7e64e9b670 dd68e283f8
commit 17514c1a45
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/util/genfsimg
View File

@ -235,17 +235,27 @@ done
# Configure ISO image, if applicable # Configure ISO image, if applicable
# #
# Note that the BIOS boot files are required even for an EFI-only ISO, # Note that the BIOS boot files are required even for an EFI-only
# since isohybrid will refuse to work without them. # hybrid ISO, since isohybrid will refuse to work without them.
# #
if [ -n "${ISOIMG}" ] ; then if [ -n "${ISOIMG}" ] ; then
ISOARGS="-J -R -l" ISOARGS="-J -R -l"
copy_syslinux_file "isolinux.bin" "${ISODIR}" if isohybrid --version >/dev/null 2>&1 ; then
copy_syslinux_file "ldlinux.c32" "${ISODIR}" 2>/dev/null || true ISOHYBRID=isohybrid
ISOARGS="${ISOARGS} -no-emul-boot -eltorito-boot isolinux.bin" else
ISOARGS="${ISOARGS} -boot-load-size 4 -boot-info-table" ISOHYBRID=
fi
if [ -n "${LKRN}" -o -n "${ISOHYBRID}" ] ; then
copy_syslinux_file "isolinux.bin" "${ISODIR}"
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
ISOARGS="${ISOARGS} -eltorito-alt-boot"
fi
fi
if [ -n "${EFI}" ] ; then if [ -n "${EFI}" ] ; then
ISOARGS="${ISOARGS} -eltorito-alt-boot -no-emul-boot -e esp.img" ISOARGS="${ISOARGS} -no-emul-boot -e esp.img"
else else
FATIMG= FATIMG=
fi fi
@ -319,7 +329,7 @@ if [ -n "${ISOIMG}" ] ; then
-appid "iPXE - Open Source Network Boot Firmware" \ -appid "iPXE - Open Source Network Boot Firmware" \
-publisher "ipxe.org" -sysid "iPXE" -o "${ISOIMG}" \ -publisher "ipxe.org" -sysid "iPXE" -o "${ISOIMG}" \
${ISOARGS} "${ISODIR}" ${ISOARGS} "${ISODIR}"
if isohybrid --version >/dev/null 2>&1 ; then if [ -n "${ISOHYBRID}" ] ; then
ISOHYBRIDARGS= ISOHYBRIDARGS=
if [ -n "${EFI}" ] ; then if [ -n "${EFI}" ] ; then
ISOHYBRIDARGS="${ISOHYBRIDARGS} --uefi" ISOHYBRIDARGS="${ISOHYBRIDARGS} --uefi"
@ -327,7 +337,7 @@ if [ -n "${ISOIMG}" ] ; then
if [ -n "${SOURCE_DATE_EPOCH:-}" ] ; then if [ -n "${SOURCE_DATE_EPOCH:-}" ] ; then
ISOHYBRIDARGS="${ISOHYBRIDARGS} --id ${SOURCE_DATE_EPOCH}" ISOHYBRIDARGS="${ISOHYBRIDARGS} --id ${SOURCE_DATE_EPOCH}"
fi fi
isohybrid ${ISOHYBRIDARGS} "${ISOIMG}" "${ISOHYBRID}" ${ISOHYBRIDARGS} "${ISOIMG}"
fi fi
fi fi