Merge lp:~ubuntu-on-ec2/vmbuilder/no-wrong-51-cloudguest into lp:~ubuntu-on-ec2/vmbuilder/automated-ec2-builds

[Steve Langasek]

/etc/update-motd.d/51-cloudguest contains information that is inconsistent with our current product offerings and we should make sure this gets nuked before we roll the last images for 14.04 before the transition to ESM

[Robert C Jennings (rcj)]

review: Approve

[Tobias Koch (tobijk)]

review: Approve

=== modified file 'vmbuilder-cloudimg-fixes'
--- vmbuilder-cloudimg-fixes	2015-08-18 11:32:24 +0000
+++ vmbuilder-cloudimg-fixes	2019-04-08 18:31:13 +0000
@@ -110,24 +110,6 @@
    sed -i "s,^[^#${bl}]*\([${bl}]*/[${bl}].*\),${lstr}\1," "${rootd}/etc/fstab"
 fi
 
-## Make sure that the update-motd.d directory exists
-[ ! -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 dist_ge "${codename}" "quantal" &&