From dae94463e4c2df83e6a31d58b82c6502f70190a1 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Fri, 13 Oct 2017 19:08:53 +0200 Subject: [PATCH] Don't fail when initramfs is not used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Hertzog --- debian/changelog | 2 ++ scripts/build/binary_linux-image | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 81dee65c4..7f948990a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ live-build (1:20170921) UNRELEASED; urgency=medium * Use $SOURCE_DATE_EPOCH when updating timestamps of manual pages in order to make the package reproducible at build time. Closes: #879169 Thanks to Chris Lamb for the patch. + * Accept kernels without initrd. Closes: #878430 + Thanks to Balint Reczey for the patch. -- Raphaël Hertzog Mon, 20 Nov 2017 22:02:22 +0100 diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image index 6227a241c..12a6304a1 100755 --- a/scripts/build/binary_linux-image +++ b/scripts/build/binary_linux-image @@ -70,7 +70,7 @@ mkdir -p "${DESTDIR}" # Installing linux-image cp chroot/boot/"${LINUX}"-* "${DESTDIR}" -cp chroot/boot/initrd.img-* "${DESTDIR}" +cp chroot/boot/initrd.img-* "${DESTDIR}" 2>&1 || Echo_message "Skip installing missing initrd." case "${LB_INITRAMFS}" in live-boot)