From 4ca92b04a7d5664eb7f02158a198113771c8080a Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Tue, 12 Mar 2019 11:47:01 -0700
Subject: [PATCH] Drop /etc/update-motd.d/51-cloudguest from cloud images; this
 is not consistent with current Ubuntu Advantage product language.  Any future
 customizations to update-motd for cloud images should be done via a package
 instead.

---
 debian/changelog                                   |  9 +++++++++
 .../ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot | 14 --------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48ee3743..a7bd00a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (2.569) UNRELEASED; urgency=medium
+
+  * Drop /etc/update-motd.d/51-cloudguest from cloud images; this is not
+    consistent with current Ubuntu Advantage product language.  Any future
+    customizations to update-motd for cloud images should be done via a
+    package instead.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 12 Mar 2019 11:39:34 -0700
+
 livecd-rootfs (2.568) disco; urgency=medium
 
   [ Tobias Koch ]
diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
index b28127ec..b8d57cc9 100755
--- a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
@@ -106,20 +106,6 @@ EOM
 [ ! -e "${rootd}/etc/update-motd.d" ] &&
    mkdir -p "${rootd}/etc/update-motd.d"
 
-## write a MOTD file advertising support for images
-cat > "${rootd}/etc/update-motd.d/51-cloudguest" << EOF
-#!/bin/sh
-#
-${CLOUD_IMG_STR}
-# This file is not managed by a package.  If you no longer want to
-# see this message you can safely remove the file.
-echo ""
-echo "  Get cloud support with Ubuntu Advantage Cloud Guest:"
-echo "    http://www.ubuntu.com/business/services/cloud"
-EOF
-
-chmod +x "${rootd}/etc/update-motd.d/51-cloudguest"
-
 # for quantal and newer, add /etc/overlayroot.local.conf
 # but do not overwrite anything that somehow got there
 if [ -f "${rootd}/etc/overlayroot.conf" ] &&