diff options
| author | Ahmad Khalifa <vexeduxr@FreeBSD.org> | 2025-01-11 15:33:20 +0200 |
|---|---|---|
| committer | Ahmad Khalifa <vexeduxr@FreeBSD.org> | 2025-08-05 04:48:45 +0300 |
| commit | 057686379c8bc24c3d2b78c3aa2e5d8b70221120 (patch) | |
| tree | 7891e89806804627df0212637acaba35268258dd | |
| parent | 51affb7e97161e260f6d99cb0904daf7cc9f51a7 (diff) | |
release/amd64: cleanup code duplication
Approved by: imp (mentor)
Pull Request: https://github.com/freebsd/freebsd-src/pull/1571
Closes: https://github.com/freebsd/freebsd-src/pull/1571
| -rwxr-xr-x | release/amd64/make-memstick.sh | 6 | ||||
| -rw-r--r-- | release/amd64/mkisoimages.sh | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/release/amd64/make-memstick.sh b/release/amd64/make-memstick.sh index cec4b27b5b96..770b128fd9f9 100755 --- a/release/amd64/make-memstick.sh +++ b/release/amd64/make-memstick.sh @@ -62,11 +62,9 @@ fi # Make an ESP in a file. espfilename=$(mktemp /tmp/efiboot.XXXXXX) if [ -f "${BASEBITSDIR}/boot/loader_ia32.efi" ]; then - make_esp_file ${espfilename} ${fat32min} ${BASEBITSDIR}/boot/loader.efi bootx64 \ - ${BASEBITSDIR}/boot/loader_ia32.efi bootia32 -else - make_esp_file ${espfilename} ${fat32min} ${BASEBITSDIR}/boot/loader.efi + extra_args="${BASEBITSDIR}/boot/loader_ia32.efi bootia32" fi +make_esp_file ${espfilename} ${fat32min} ${BASEBITSDIR}/boot/loader.efi bootx64 ${extra_args} ${MKIMG} -s mbr \ -b ${BASEBITSDIR}/boot/mbr \ diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh index 8f7163e05261..01677ae787f9 100644 --- a/release/amd64/mkisoimages.sh +++ b/release/amd64/mkisoimages.sh @@ -54,11 +54,9 @@ if [ "$1" = "-b" ]; then # ESP file size in KB. espsize="2048" if [ -f "${BASEBITSDIR}/boot/loader_ia32.efi" ]; then - make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi bootx64 \ - ${BASEBITSDIR}/boot/loader_ia32.efi bootia32 - else - make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi + extra_args="${BASEBITSDIR}/boot/loader_ia32.efi bootia32" fi + make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi bootx64 ${extra_args} bootable="$bootable -o bootimage=i386;${espfilename} -o no-emul-boot -o platformid=efi" shift |