Merge lp:~rbalint/livecd-rootfs/fix-suppressing-kpartx-error

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.452) UNRELEASED; urgency=medium
+
+  * Fix suppressing kpartx error
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 29 Aug 2017 16:18:36 +0200
+
 livecd-rootfs (2.451) artful; urgency=medium
 
   * Fix a reference to an undefined variable in the ubuntu-cpc hooks,

live-build/functions

@@ -19,7 +19,7 @@ clean_loops() {
         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
+            if echo "$kpartx_stdout" | grep -q "loop deleted"; then
                 echo "Suppressing kpartx returning error (#860894)"
             else
                 exit $kpartx_ret