Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-03 14:11:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.452 to ubuntu/artful-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 00f18b8d7251083535e2a01110f5340e05ad6f0f

New changelog entries:
  * Fix suppressing kpartx error
This commit is contained in:
Balint Reczey 2017-08-29 16:18:36 +02:00 committed by usd-importer
parent 00f18b8d72
commit 70a41fd45c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.452) artful; urgency=medium
* Fix suppressing kpartx error
-- Balint Reczey <rbalint@ubuntu.com> Tue, 29 Aug 2017 16:18:36 +0200
livecd-rootfs (2.451) artful; urgency=medium livecd-rootfs (2.451) artful; urgency=medium
* Fix a reference to an undefined variable in the ubuntu-cpc hooks, * Fix a reference to an undefined variable in the ubuntu-cpc hooks,

2
live-build/functions
View File

@ -19,7 +19,7 @@ clean_loops() {
kpartx_stdout=$(kpartx -v -d "${backing_img}") || kpartx_ret=$? kpartx_stdout=$(kpartx -v -d "${backing_img}") || kpartx_ret=$?
echo "$kpartx_stdout" echo "$kpartx_stdout"
if [ -n "$kpartx_ret" ]; then 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)" echo "Suppressing kpartx returning error (#860894)"
else else
exit $kpartx_ret exit $kpartx_ret