diff --git a/debian/changelog b/debian/changelog index af16d5bf..63a4ad22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +livecd-rootfs (23.10.31) mantic; urgency=medium + + * blkid is unreliable in mount_image(), but this blkid call is only here + for debugging, so ignore any failures (even if we don't understand + them). LP: #2034299. + * mark the minimized autopkgtest as also allowing stderr, in the event of + any error messages from blkid. + + -- Steve Langasek Tue, 05 Sep 2023 14:42:03 -0700 + livecd-rootfs (23.10.30) mantic; urgency=medium * Fix unminimize to correctly list packages. (LP: #1996489) diff --git a/debian/tests/control b/debian/tests/control index 0747493a..28f5903f 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -4,4 +4,4 @@ Restrictions: needs-root isolation-machine allow-stderr Tests: minimized Depends: @, lsb-release -Restrictions: needs-root isolation-machine +Restrictions: needs-root isolation-machine allow-stderr diff --git a/live-build/functions b/live-build/functions index 4a97e9c2..84e062c9 100644 --- a/live-build/functions +++ b/live-build/functions @@ -78,7 +78,8 @@ mount_image() { # Add some information to the debug logs echo "Mounted disk image ${backing_img} to ${rootfs_dev_mapper}" - blkid ${rootfs_dev_mapper} + blkid ${rootfs_dev_mapper} \ + || echo "blkid failed; continuing" return 0 }