summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xscripts/build/binary_linux-image2
2 files changed, 3 insertions, 1 deletions
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 <lamby@debian.org> for the patch.
+ * Accept kernels without initrd. Closes: #878430
+ Thanks to Balint Reczey <balint.reczey@canonical.com> for the patch.
-- Raphaƫl Hertzog <hertzog@debian.org> 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)