1
=== modified file 'debian/changelog'
2
--- debian/changelog	2018-12-10 22:15:42 +0000
3
+++ debian/changelog	2018-12-12 02:20:50 +0000
4
@@ -1,3 +1,9 @@
5
1
livecd-rootfs (2.550) UNRELEASED; urgency=medium
6
2
7
3
  * Fix typo preventing builds of ubuntu-core images.
8
4
9
5
 -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 12 Dec 2018 15:09:28 +1300
10
6
11
1
livecd-rootfs (2.549) disco; urgency=medium
7
livecd-rootfs (2.549) disco; urgency=medium
12
2
8
13
3
  [ Tobias Koch ]
9
  [ Tobias Koch ]
14
4
10
15
=== modified file 'live-build/auto/build'
16
--- live-build/auto/build	2018-12-06 11:38:07 +0000
17
+++ live-build/auto/build	2018-12-12 02:20:50 +0000
18
@@ -23,7 +23,7 @@
19
23
if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
23
if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
20
24
	# Use ubuntu-image instead of live-build
24
	# Use ubuntu-image instead of live-build
21
25
25
23
26
	if [ "$PROJECT" = "ubuntu-core"]; then
26
	if [ "$PROJECT" = "ubuntu-core" ]; then
24
27
		CHANNEL="${CHANNEL:-edge}"
27
		CHANNEL="${CHANNEL:-edge}"
25
28
		env SNAPPY_STORE_NO_CDN=1 \
28
		env SNAPPY_STORE_NO_CDN=1 \
26
29
		ubuntu-image snap -c "$CHANNEL" $UBUNTU_IMAGE_ARGS \
29
		ubuntu-image snap -c "$CHANNEL" $UBUNTU_IMAGE_ARGS \
Status:	Merged
Approved by:	Łukasz Zemczak on 2018-12-12
Approved revision:	1737
Merged at revision:	1737
Proposed branch:	lp:~mwhudson/livecd-rootfs/tyop
Merge into:	lp:livecd-rootfs
Diff against target:	26 lines (+7/-1) 2 files modified debian/changelog (+6/-0) live-build/auto/build (+1/-1)
To merge this branch:	bzr merge lp:~mwhudson/livecd-rootfs/tyop
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Łukasz Zemczak		2018-12-12	Approve on 2018-12-12
Review via email: mp+360766@code.launchpad.net