From 7774d33c9b1ec87ec2a86daf500500dffc2bb8b8 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Fri, 17 Apr 2015 13:29:03 -0600 Subject: [PATCH] Import patches-unapplied version 2.299 to ubuntu/vivid-proposed Imported using git-ubuntu import. Changelog parent: da9dd163bad89ade1243926c6abcc146cb6188f3 New changelog entries: * Fix snappy motd to not reference 'development', which isn't always true. --- debian/changelog | 6 ++++++ live-build/ubuntu-core/hooks/14-set-motd.chroot | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 163d9890..eb3798e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.299) vivid; urgency=medium + + * Fix snappy motd to not reference 'development', which isn't always true. + + -- Adam Conrad Fri, 17 Apr 2015 13:29:03 -0600 + livecd-rootfs (2.298) vivid; urgency=low * live-build/auto/config: diff --git a/live-build/ubuntu-core/hooks/14-set-motd.chroot b/live-build/ubuntu-core/hooks/14-set-motd.chroot index c43917f9..206a57db 100644 --- a/live-build/ubuntu-core/hooks/14-set-motd.chroot +++ b/live-build/ubuntu-core/hooks/14-set-motd.chroot @@ -1,7 +1,7 @@ #!/bin/sh cat >/etc/motd<