From 9ecbce203c4fc5100ffec86384847f257a58e496 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Tue, 29 Aug 2017 16:19:04 +0200 Subject: [PATCH 1/2] Start working on next upload --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 565b58a7..c74b1bd9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.452) UNRELEASED; urgency=medium + + * + + -- 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, From 4d72521491a6b6e615222308c94f7d0949d901d9 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Wed, 30 Aug 2017 16:46:47 +0200 Subject: [PATCH 2/2] Fix suppressing kpartx error --- debian/changelog | 2 +- live-build/functions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c74b1bd9..69fb84fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ livecd-rootfs (2.452) UNRELEASED; urgency=medium - * + * Fix suppressing kpartx error -- Balint Reczey Tue, 29 Aug 2017 16:18:36 +0200 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