From 70a41fd45c903321d6379955ec04b19a1c8e5bd4 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Tue, 29 Aug 2017 16:18:36 +0200 Subject: [PATCH] Import patches-unapplied version 2.452 to ubuntu/artful-proposed Imported using git-ubuntu import. Changelog parent: 00f18b8d7251083535e2a01110f5340e05ad6f0f New changelog entries: * Fix suppressing kpartx error --- debian/changelog | 6 ++++++ live-build/functions | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 565b58a7..3396a436 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.452) artful; urgency=medium + + * Fix suppressing kpartx error + + -- Balint Reczey 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, diff --git a/live-build/functions b/live-build/functions index fee44f67..7d645b9e 100644 --- a/live-build/functions +++ b/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