Fix suppression of kpartx error. LP: #1684090.

This commit is contained in:
Steve Langasek 2017-09-11 14:34:09 -07:00
parent 314a6b95a3
commit 3fdf3933ed
2 changed files with 4 additions and 1 deletions

3
debian/changelog vendored
View File

@ -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 <steve.langasek@ubuntu.com> Wed, 23 Aug 2017 17:35:40 -0700
livecd-rootfs (2.408.14) xenial; urgency=medium

View File

@ -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