diff --git a/debian/changelog b/debian/changelog index 781c9b0a..b52ad2f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.208.17) 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. LP: #1823776. + + -- Steve Langasek Tue, 12 Mar 2019 11:39:34 -0700 + livecd-rootfs (2.208.16) trusty; urgency=medium * For omap and omap4, enable the universe component for u-boot-linaro-omap* diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot index 815d946d..f9843052 100644 --- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot @@ -126,20 +126,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" ] &&