Merge lp:~rbalint/livecd-rootfs/livecd-rootfs-autopkgtest-fix-for-zesty

debian/changelog

@@ -1,3 +1,14 @@
+livecd-rootfs (2.441.4) UNRELEASED; urgency=medium
+
+  * Resurrect Balint's fix from
+    lp:~rbalint/livecd-rootfs/livecd-rootfs-autopkgtest-fix to wrap kpartx
+    and trap spurious errors, since the problem is still being seen
+    intermittently on i386 despite us calling sync before kpartx. (LP: #1684090)
+  * Mark autopkgtests isolation-machine since debootstrap won't work in a
+    container.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 28 Apr 2017 17:41:05 -0700
+
 livecd-rootfs (2.441.3) zesty; urgency=medium
 
   * live-build/ubuntu-cpc/hooks/999-extras.binary: Exit on first failure.

debian/tests/control

@@ -1,3 +1,3 @@
 Tests: default-bootstraps
 Depends: @, lsb-release
-Restrictions: needs-root
+Restrictions: needs-root isolation-machine

live-build/functions

@@ -11,9 +11,22 @@ backing_img=
 apt-get -qqy install dosfstools gdisk
 
 clean_loops() {
+    local kpartx_ret
+    local kpartx_stdout
 
     if [ -n "${backing_img}" ]; then
-        kpartx -v -d "${backing_img}"
+        # sync before removing loop to avoid "Device or resource busy" errors
+        sync
+        kpartx_ret=""
+        kpartx_stdout=$(kpartx -v -d "${backing_img}") || kpartx_ret=$?
+        echo "$kpartx_stdout"
+        if [ -n "$kpartx_ret" ]; then
+            if echo "$kpartx_stdout" | grep -q "loop deleted: "; then
+                echo "Suppressing kpartx returning error (#860894)"
+            else
+                exit $kpartx_ret
+            fi
+        fi
         unset backing_img
     fi