[Merge] livecd-rootfs:no-unpackaged-motd into livecd-rootfs:ubuntu/master

[Steve Langasek]

Diff comments:

> 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 b28127e..b8d57cc 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
> @@ -106,20 +106,6 @@ EOM
>  [ ! -e "${rootd}/etc/update-motd.d" ] &&
>     mkdir -p "${rootd}/etc/update-motd.d"

thanks, I think it's harmless to have this here but it can also definitely go away.

>  
> -## 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" ] &&


-- 
https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+merge/364337
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.