From c87f87e4e1e4e64ba03c4fed9734f35b6c1609b7 Mon Sep 17 00:00:00 2001 From: Steve Langasek 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 +++++++++ live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot | 14 -------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index ddd49727..7b73467f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.525.20) 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 Tue, 12 Mar 2019 11:39:34 -0700 + livecd-rootfs (2.525.19) bionic; 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 ef03273d..39b17e2d 100755 --- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks/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" ] &&