From 52f8a0544fbc8c691d446ca304d33dd0f4dfd7b7 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 10 Dec 2014 12:56:48 +0100
Subject: [PATCH] - fix message *
 live-build/ubuntu-core/hooks/14-set-motd.chroot:   - update motd

---
 debian/changelog                                         | 3 +++
 live-build/ubuntu-core/hooks/14-set-motd.chroot          | 9 +++++----
 .../ubuntu-core/hooks/400-create-apt-get-warning.binary  | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80ff3885..728ec0d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ livecd-rootfs (2.274) UNRELEASED; urgency=medium
   * live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary:
     - fix incorrect "echo"
     - add missing wrappers for apt, apt-cache
+    - fix message
+  * live-build/ubuntu-core/hooks/14-set-motd.chroot:
+    - update motd
 
   [ James Hunt ]
   * live-build/ubuntu-core/hooks/10-remove-documentation.binary:
diff --git a/live-build/ubuntu-core/hooks/14-set-motd.chroot b/live-build/ubuntu-core/hooks/14-set-motd.chroot
index e1088ca8..c43917f9 100644
--- a/live-build/ubuntu-core/hooks/14-set-motd.chroot
+++ b/live-build/ubuntu-core/hooks/14-set-motd.chroot
@@ -1,11 +1,12 @@
 #!/bin/sh
 
 cat >/etc/motd<<EOF
-Welcome to Ubuntu Core (development branch)
+Welcome to the Ubuntu Core rolling development release.
 
  * See https://ubuntu.com/snappy
 
-Surprise! It's a brave new Ubuntu world here in the snappy development
-channel. Ubuntu Core does not use APT, see 'snappy --help' for ideas
-on how to make the most of this transactional system.
+It's a brave new world here in snappy Ubuntu Core! This machine
+does not use apt-get or deb packages. Please see 'snappy --help'
+for app installation and transactional updates.
+
 EOF
diff --git a/live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary b/live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary
index 4c1a8db9..94e88a1f 100644
--- a/live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary
+++ b/live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary
@@ -10,7 +10,7 @@ mkdir -p $PREFIX/usr/local/bin
 cat >$PREFIX/usr/local/bin/no-apt <<EOF
 #!/bin/sh
 cat <<EOF
-Ubuntu Core does not use APT, see 'snappy --help'!
+Ubuntu Core does not use apt-get, see 'snappy --help'!
 EOF
 chmod 755 $PREFIX/usr/local/bin/no-apt