From 4089d75a2175b397937e87a363f4330969fedc07 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 8 Mar 2016 19:43:19 +0100 Subject: [PATCH] Import patches-unapplied version 2.384 to ubuntu/xenial-proposed Imported using git-ubuntu import. Changelog parent: 24f93cf89e599c662f4e33d6c57fbeb30f0950d8 New changelog entries: * slightly adjust the naming of the OS snap for snappy builds so it becomes easier for cdimage to grab and publish it. --- debian/changelog | 7 +++++++ live-build/auto/build | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 939f3868..c7d1a82f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.384) xenial; urgency=medium + + * slightly adjust the naming of the OS snap for snappy builds so it becomes + easier for cdimage to grab and publish it. + + -- Oliver Grawert Tue, 08 Mar 2016 19:43:19 +0100 + livecd-rootfs (2.383) xenial; urgency=medium * add snap cration for ubuntu-core snappy rootfs builds diff --git a/live-build/auto/build b/live-build/auto/build index bc72181a..4596789c 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -341,7 +341,7 @@ EOF snappy build --squashfs $rootfs snapfile="$(ls ubuntu-core*.snap)" - cp -a $snapfile $PREFIX.$snapfile + cp -a $snapfile $PREFIX.os.snap fi fi