Compare commits

...

6 Commits

Author SHA1 Message Date
Steve Langasek
0129af508b releasing package livecd-rootfs version 2.441.4 2017-06-06 23:09:32 -07:00
Steve Langasek
60971f3ed3 changelog cleanup for SRU 2017-06-06 23:08:28 -07:00
Steve Langasek
5a068b569d Merge lp:~rbalint/livecd-rootfs/livecd-rootfs-autopkgtest-fix-for-zesty 2017-05-12 11:58:54 -07:00
Robert C Jennings
8c0354d18c live-build/ubuntu-cpc/hooks/999-extras.binary: Exit on first failure.
(LP: #1687752)
2017-05-12 11:56:40 -07:00
Steve Langasek
1b95302ef7 Resurrect Balint's fix from
lp:~rbalint/livecd-rootfs/livecd-rootfs-autopkgtest-fix to wrap kpartx
and trap spurious errors, since the problem is still being seen
intermittently on i386 despite us calling sync before kpartx. (LP: #1684090)
2017-05-11 15:31:29 +02:00
Steve Langasek
8b141ef85a Mark autopkgtests isolation-machine since debootstrap won't work in a
container.
2017-05-08 21:04:47 +02:00
4 changed files with 35 additions and 3 deletions

19
debian/changelog vendored
View File

@ -1,3 +1,22 @@
livecd-rootfs (2.441.4) zesty; urgency=medium
[ Balint Reczey ]
* wrap kpartx and trap spurious errors, to work around kpartx
unreliability as seen in autopkgtests. (LP: #1684090)
[ Steve Langasek ]
* Mark autopkgtests isolation-machine since debootstrap won't work in a
container.
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 06 Jun 2017 23:09:10 -0700
livecd-rootfs (2.441.3) zesty; urgency=medium
* live-build/ubuntu-cpc/hooks/999-extras.binary: Exit on first failure.
(LP: #1687752)
-- Robert C Jennings <robert.jennings@canonical.com> Tue, 09 May 2017 13:46:01 -0700
livecd-rootfs (2.441.2) zesty; urgency=medium
* The ubuntu-server:live should use a casper-based initramfs to work

View File

@ -1,3 +1,3 @@
Tests: default-bootstraps
Depends: @, lsb-release
Restrictions: needs-root
Restrictions: needs-root isolation-machine

View File

@ -11,9 +11,22 @@ backing_img=
apt-get -qqy install dosfstools gdisk
clean_loops() {
local kpartx_ret
local kpartx_stdout
if [ -n "${backing_img}" ]; then
kpartx -v -d "${backing_img}"
# sync before removing loop to avoid "Device or resource busy" errors
sync
kpartx_ret=""
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
echo "Suppressing kpartx returning error (#860894)"
else
exit $kpartx_ret
fi
fi
unset backing_img
fi

View File

@ -13,4 +13,4 @@ export CLOUD_IMG_STR="$IMAGE_STR"
export FS_LABEL="cloudimg-rootfs"
# Cleaner execution
/bin/run-parts --regex ".*\.binary" "${extra_d}"
/bin/run-parts --exit-on-error --regex ".*\.binary" "${extra_d}"