From 3fdf3933ed5f6c5de6e69814a47d163d2033e25b Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 11 Sep 2017 14:34:09 -0700 Subject: [PATCH] Fix suppression of kpartx error. LP: #1684090. --- debian/changelog | 3 +++ live-build/ubuntu-cpc/functions | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 36d83f7f..c5a3cb49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ livecd-rootfs (2.408.15) UNRELEASED; urgency=medium interesting bind-mounts under /dev (e.g. loop devices bind-mounted by LXD). LP: #1716465. + [ Balint Reczey ] + * Fix suppression of kpartx error. LP: #1684090. + -- Steve Langasek Wed, 23 Aug 2017 17:35:40 -0700 livecd-rootfs (2.408.14) xenial; urgency=medium diff --git a/live-build/ubuntu-cpc/functions b/live-build/ubuntu-cpc/functions index 038152a4..685bc24f 100644 --- a/live-build/ubuntu-cpc/functions +++ b/live-build/ubuntu-cpc/functions @@ -21,7 +21,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