diff -Nru flash-kernel-3.98ubuntu10~18.04.1/debian/changelog flash-kernel-3.98ubuntu11~18.04.1/debian/changelog --- flash-kernel-3.98ubuntu10~18.04.1/debian/changelog 2020-01-24 15:19:25.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/debian/changelog 2020-01-29 16:15:05.000000000 +0000 @@ -1,3 +1,10 @@ +flash-kernel (3.98ubuntu11~18.04.1) bionic; urgency=medium + + * Permit flash-kernel to workaround an inconsistent /boot directory when + triggered prior to the kernel finishing its triggers (LP: #1861292) + + -- Dave Jones Wed, 29 Jan 2020 16:15:05 +0000 + flash-kernel (3.98ubuntu10~18.04.1) bionic; urgency=medium * SRU of 3.98ubuntu10 to support Raspberry Pi 4B. (LP: #1847587) diff -Nru flash-kernel-3.98ubuntu10~18.04.1/functions flash-kernel-3.98ubuntu11~18.04.1/functions --- flash-kernel-3.98ubuntu10~18.04.1/functions 2020-01-24 15:19:25.000000000 +0000 +++ flash-kernel-3.98ubuntu11~18.04.1/functions 2020-01-29 16:15:05.000000000 +0000 @@ -830,18 +830,9 @@ idesc="ramdisk $kvers" if [ ! -e $kfile ] || [ ! -e $ifile ]; then - # installation-report #781742 included: - # Can't find /boot/vmlinuz-[...] or /boot/initrd.img-[...] - # - # It's unclear how this can have happened or what state the - # system was in, so log some additional information in the - # hopes of catching it in the act next time. - ( - set -x - ls -l $kfile* - ls -l $ifile* - ) >> /tmp/flash-kernel-no-kernel-error.log 2>&1 - error "Can't find $kfile or $ifile (see /tmp/flash-kernel-no-kernel-error.log)" + # See debian bug #781742 and LP: #1861292 + echo "flash-kernel: $kfile or $ifile missing; expecting future run" >&2 + exit 0 fi kfilesize=$(stat -c '%s' "$kfile") ifilesize=$(stat -c '%s' "$ifile")