diff options
| author | Balint Reczey <balint.reczey@canonical.com> | 2017-10-13 19:08:53 +0200 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2017-11-20 22:09:49 +0100 |
| commit | dae94463e4c2df83e6a31d58b82c6502f70190a1 (patch) | |
| tree | cb119edc49be8914f3e313dcedfe39a762f5f26c | |
| parent | 1f1dce740ec271b21d88fcad7c7b40ea2e57a2d2 (diff) | |
| download | vyos-live-build-dae94463e4c2df83e6a31d58b82c6502f70190a1.tar.gz vyos-live-build-dae94463e4c2df83e6a31d58b82c6502f70190a1.zip | |
Don't fail when initramfs is not used
Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | scripts/build/binary_linux-image | 2 |
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) |