livecd-rootfs

Merge lp:~rbalint/livecd-rootfs/fix-suppressing-kpartx-error into lp:livecd-rootfs

  1. fix-suppressing-kpartx-error
  2. Merge into trunk
Proposed by Balint Reczey
Status: Merged
Merged at revision: 1502
Proposed branch: lp:~rbalint/livecd-rootfs/fix-suppressing-kpartx-error
Merge into: lp:livecd-rootfs
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
live-build/functions (+1/-1)
To merge this branch: bzr merge lp:~rbalint/livecd-rootfs/fix-suppressing-kpartx-error
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Ubuntu Core Development Team Pending
Review via email: mp+329929@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-08-25 21:28:47 +0000
3+++ debian/changelog 2017-08-30 14:58:19 +0000
4@@ -1,3 +1,9 @@
5+livecd-rootfs (2.452) UNRELEASED; urgency=medium
6+
7+ * Fix suppressing kpartx error
8+
9+ -- Balint Reczey <rbalint@ubuntu.com> Tue, 29 Aug 2017 16:18:36 +0200
10+
11 livecd-rootfs (2.451) artful; urgency=medium
12
13 * Fix a reference to an undefined variable in the ubuntu-cpc hooks,
14
15=== modified file 'live-build/functions'
16--- live-build/functions 2017-07-24 18:46:51 +0000
17+++ live-build/functions 2017-08-30 14:58:19 +0000
18@@ -19,7 +19,7 @@
19 kpartx_stdout=$(kpartx -v -d "${backing_img}") || kpartx_ret=$?
20 echo "$kpartx_stdout"
21 if [ -n "$kpartx_ret" ]; then
22- if echo "$kpartx_stdout" | grep -q "loop deleted: "; then
23+ if echo "$kpartx_stdout" | grep -q "loop deleted"; then
24 echo "Suppressing kpartx returning error (#860894)"
25 else
26 exit $kpartx_ret

Subscribers

People subscribed via source and target branches