From 9a31a9b77f37d0f0aaf1f000ea6200742ca45b13 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Thu, 14 Mar 2019 21:26:07 +0000 Subject: [PATCH] Imported 2.569 No reason for CPC update specified. --- debian/changelog | 9 +++++++++ .../hooks.d/chroot/999-cpc-fixes.chroot | 18 ------------------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 48ee3743..f11ce0d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.569) disco; 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 Thu, 14 Mar 2019 10:05:48 -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..33606a2a 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 @@ -102,24 +102,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" ] &&