Try to use udevadm settle after losetup to resolve race in riscv64 image builds.

This commit is contained in:
Steve Langasek 2023-05-08 15:47:04 -07:00
parent ada1f09b39
commit ef146db895
2 changed files with 7 additions and 0 deletions

5
debian/changelog vendored
View File

@ -1,10 +1,15 @@
livecd-rootfs (2.833) UNRELEASED; urgency=medium livecd-rootfs (2.833) UNRELEASED; urgency=medium
[ Łukasz 'sil2100' Zemczak ]
* Add ubuntucinnamon, ubuntu-unity and edubuntu to the workaround for the * Add ubuntucinnamon, ubuntu-unity and edubuntu to the workaround for the
invalid apt cache issue we encountered during all of our previous invalid apt cache issue we encountered during all of our previous
releases. releases.
* Switch to use the desktop model for the installer for the canary images. * Switch to use the desktop model for the installer for the canary images.
[ Steve Langasek ]
* Try to use udevadm settle after losetup to resolve race in riscv64 image
builds.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Wed, 26 Apr 2023 13:36:30 +0200 -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Wed, 26 Apr 2023 13:36:30 +0200
livecd-rootfs (2.832) lunar; urgency=medium livecd-rootfs (2.832) lunar; urgency=medium

View File

@ -64,6 +64,8 @@ mount_image() {
local rootpart="$2" local rootpart="$2"
loop_device=$(losetup --show -f -P -v ${backing_img}) loop_device=$(losetup --show -f -P -v ${backing_img})
udevadm settle
if [ ! -b ${loop_device} ]; then if [ ! -b ${loop_device} ]; then
echo "unable to find loop device for ${backing_img}" echo "unable to find loop device for ${backing_img}"
exit 1 exit 1