From 2d6d50b86f5a69696218101a561a605cc4b2b20d Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 28 Apr 2017 18:22:45 -0700 Subject: [PATCH] Import patches-unapplied version 2.444 to ubuntu/artful-proposed Imported using git-ubuntu import. Changelog parent: def10927e48845519813636d507cab701cc618a4 New changelog entries: * For now, make sure all automated image builds are on the edge channel. Eventually we will want to pass the channel as build metadata instead. --- debian/changelog | 7 +++++++ live-build/auto/build | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 904b2bb4..a5697547 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.444) artful; urgency=medium + + * For now, make sure all automated image builds are on the edge channel. + Eventually we will want to pass the channel as build metadata instead. + + -- Steve Langasek Fri, 28 Apr 2017 18:22:45 -0700 + livecd-rootfs (2.443) artful; urgency=medium * Mark autopkgtests isolation-machine since debootstrap won't work in a diff --git a/live-build/auto/build b/live-build/auto/build index 90b0f6f3..50bc8333 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -19,7 +19,9 @@ 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 + env SNAPPY_STORE_NO_CDN=1 \ + ubuntu-image -c edge \ + -o livecd."$PROJECT".img livecd."$PROJECT".model-assertion pxz -T4 livecd."$PROJECT".img exit 0 fi