From 91bde498cb1d745baa061aa514ae551030ef7448 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 11 Sep 2017 11:59:56 -0700 Subject: [PATCH] Fix suppression of kpartx error. LP: #1684090. --- debian/changelog | 3 +++ live-build/functions | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f8b3b122..8d79f5ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ livecd-rootfs (2.441.5) 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 Mon, 11 Sep 2017 11:47:53 -0700 livecd-rootfs (2.441.4) zesty; urgency=medium diff --git a/live-build/functions b/live-build/functions index f4dd0954..02c366b4 100644 --- a/live-build/functions +++ b/live-build/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