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
1
livecd-rootfs (2.452) UNRELEASED; urgency=medium
6
2
7
3
  * Fix suppressing kpartx error
8
4
9
5
 -- Balint Reczey <rbalint@ubuntu.com>  Tue, 29 Aug 2017 16:18:36 +0200
10
6
11
1
livecd-rootfs (2.451) artful; urgency=medium
7
livecd-rootfs (2.451) artful; urgency=medium
12
2
8
13
3
  * Fix a reference to an undefined variable in the ubuntu-cpc hooks,
9
  * Fix a reference to an undefined variable in the ubuntu-cpc hooks,
14
4
10
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
19
        kpartx_stdout=$(kpartx -v -d "${backing_img}") || kpartx_ret=$?
19
        kpartx_stdout=$(kpartx -v -d "${backing_img}") || kpartx_ret=$?
20
20
        echo "$kpartx_stdout"
20
        echo "$kpartx_stdout"
21
21
        if [ -n "$kpartx_ret" ]; then
21
        if [ -n "$kpartx_ret" ]; then
23
22
            if echo "$kpartx_stdout" | grep -q "loop deleted: "; then
22
            if echo "$kpartx_stdout" | grep -q "loop deleted"; then
24
23
                echo "Suppressing kpartx returning error (#860894)"
23
                echo "Suppressing kpartx returning error (#860894)"
25
24
            else
24
            else
26
25
                exit $kpartx_ret
25
                exit $kpartx_ret
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
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Steve Langasek	2017-08-30	Pending
Ubuntu Core Development Team	2017-08-30	Pending
Review via email: mp+329929@code.launchpad.net