Commit cf63744d authored by Thierry Bultel's avatar Thierry Bultel Committed by Thomas Petazzoni
Browse files

fs/iso9660: do not use an initrd in iso image when using initramfs 



When using initramfs built into the kernel, it is useless to put an
initrd in the iso image.  This patch makes the image to only contain
the kernel image, and also removes the initrd line from menu.lst

Signed-off-by: default avatarThierry Bultel <thierry.bultel@wanadoo.fr>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 183b1081

fs/iso9660/iso9660.mk

+4 −0
Original line number Diff line number Diff line
@@ -17,7 +17,11 @@ $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub 
	cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/

	cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst

	cp $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel

ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)

	$(SED) '/initrd/d'  $(ISO9660_TARGET_DIR)/boot/grub/menu.lst

else

	cp $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) $(ISO9660_TARGET_DIR)/initrd

endif

	# Use fakeroot to pretend all target binaries are owned by root

	rm -f $(FAKEROOT_SCRIPT)

	echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(FAKEROOT_SCRIPT)