Commit e4516302 authored by Nir Lichtman's avatar Nir Lichtman Committed by Ingo Molnar
Browse files

x86/build: Fix broken copy command in genimage.sh when making isoimage 



Problem: Currently when running the "make isoimage" command there is an
error related to wrong parameters passed to the cp command:

  "cp: missing destination file operand after 'arch/x86/boot/isoimage/'"

This is caused because FDINITRDS is an empty array.

Solution: Check if FDINITRDS is empty before executing the "cp" command,
similar to how it is done in the case of hdimage.

Signed-off-by: default avatarNir Lichtman <nir@lichtman.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Michal Marek <michal.lkml@markovi.net>
Link: https://lore.kernel.org/r/20250110120500.GA923218@lichtman.org
parent d082ecbc

arch/x86/boot/genimage.sh

+4 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
# This script requires:

#   bash

#   syslinux

#   genisoimage

#   mtools (for fdimage* and hdimage)

#   edk2/OVMF (for hdimage)

#
@@ -251,7 +252,9 @@ geniso() { 
	cp "$isolinux" "$ldlinux" "$tmp_dir"

	cp "$FBZIMAGE" "$tmp_dir"/linux

	echo default linux "$KCMDLINE" > "$tmp_dir"/isolinux.cfg

	if [ ${#FDINITRDS[@]} -gt 0 ]; then

		cp "${FDINITRDS[@]}" "$tmp_dir"/

	fi

	genisoimage -J -r -appid 'LINUX_BOOT' -input-charset=utf-8 \

		    -quiet -o "$FIMAGE" -b isolinux.bin \

		    -c boot.cat -no-emul-boot -boot-load-size 4 \