From def10927e48845519813636d507cab701cc618a4 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 28 Apr 2017 17:50:07 -0700 Subject: [PATCH] Import patches-unapplied version 2.443 to ubuntu/artful-proposed Imported using git-ubuntu import. Changelog parent: de6bd722ae1c82766d1b037be8814b55f3249a73 New changelog entries: * Mark autopkgtests isolation-machine since debootstrap won't work in a container. * Use xz to compress ubuntu-image .img files before transfer, so that we have smaller downloads and retain file sparseness everywhere. --- debian/changelog | 9 +++++++++ debian/tests/control | 2 +- live-build/auto/build | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e2f2b9d5..904b2bb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.443) artful; urgency=medium + + * Mark autopkgtests isolation-machine since debootstrap won't work in a + container. + * Use xz to compress ubuntu-image .img files before transfer, so that we + have smaller downloads and retain file sparseness everywhere. + + -- Steve Langasek Fri, 28 Apr 2017 17:50:07 -0700 + livecd-rootfs (2.442) artful; urgency=medium [ Robert Jennings ] diff --git a/debian/tests/control b/debian/tests/control index a37a5d79..b40640f9 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ Tests: default-bootstraps Depends: @, lsb-release -Restrictions: needs-root +Restrictions: needs-root isolation-machine diff --git a/live-build/auto/build b/live-build/auto/build index cfe00bdd..90b0f6f3 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -17,7 +17,10 @@ fi if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then # Use ubuntu-image instead of live-build + apt-get install -qqy pxz + env SNAPPY_STORE_NO_CDN=1 ubuntu-image -o livecd."$PROJECT".img livecd."$PROJECT".model-assertion + pxz -T4 livecd."$PROJECT".img exit 0 fi