diff --git a/debian/changelog b/debian/changelog index 53878aaf..1eb498a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.408.45) xenial; 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 Thu, 14 Mar 2019 14:11:57 -0700 + livecd-rootfs (2.408.44) xenial; urgency=medium * Make sure buildd images have a /usr/sbin/policy-rc.d symlink diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot index 6de926ed..56b6950c 100755 --- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot @@ -126,24 +126,6 @@ cat > /etc/fstab << EOM LABEL=cloudimg-rootfs / ext4 defaults 0 0 EOM -## 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 [ -f "${rootd}/etc/overlayroot.conf" ] && diff --git a/wget-log b/wget-log new file mode 100644 index 00000000..e69de29b diff --git a/wget-log.1 b/wget-log.1 new file mode 100644 index 00000000..e69de29b