Imported 2.666

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,17 @@
+livecd-rootfs (2.666) groovy; urgency=medium
+
+  [ Balint Reczey ]
+  * debian/gbp.conf: Add minimal configuration for branch and tag naming
+
+  [ Michael Hudson-Doyle ]
+  * Call udevadm settle before kpartx -d
+
+  [ Dimitri John Ledkov ]
+  * Fixup indentation
+  * make-lxd-metadata: add riscv64 lxd architecture tag
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 12 May 2020 12:29:16 +0100
+
 livecd-rootfs (2.665) groovy; urgency=medium
 
   * Bump only the UC20 pc image to 8GB, and keep Pi images as small as possible.

debian/gbp.conf

@@ -0,0 +1,3 @@
+[DEFAULT]
+debian-branch=ubuntu/master
+debian-tag = %(version)s

live-build/auto/config

@@ -360,14 +360,14 @@ case $IMAGEFORMAT in
 			case $MODEL in
 				pc-amd64|pc-i386)
 					if [ -z "${SUBARCH:-}" ]; then
-					case $SUITE in
+						case $SUITE in
-						xenial|bionic)
+							xenial|bionic)
-							UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
+								UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
-							;;
+								;;
-						*)
+							*)
-							UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 8G"
+								UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 8G"
-							;;
+								;;
-					esac
+						esac
 					fi
 					;;
 				*) ;;

live-build/functions

@@ -14,18 +14,12 @@ clean_loops() {
     local kpartx_stdout
 
     if [ -n "${backing_img}" ]; then
-        # sync before removing loop to avoid "Device or resource busy" errors
+        # If something just finished writing to the device or a
+        # partition (e.g. the zerofree in umount_partition) udev might
+        # still be processing the device.
+        udevadm settle
         sync
-        kpartx_ret=""
+        kpartx -v -d "${backing_img}"
-        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
 

live-build/make-lxd-metadata.py

@@ -17,6 +17,7 @@ lxd_arches = {
     "powerpc": "ppc",
     "ppc64el": "ppc64le",
     "s390x": "s390x",
+    "riscv64": "riscv64",
     }