From 6a535e5b5d9b1d52bfd69b488fb3f2f1a5348dbe Mon Sep 17 00:00:00 2001
From: root <root@localhost>
Date: Tue, 15 Oct 2019 11:49:11 +0200
Subject: [PATCH] committing changes in /etc made by "/usr/bin/python3
 /usr/sbin/aptd"

Package changes:
-apt 1.8.1 amd64
+apt 1.8.3 amd64
-apt-transport-https 1.8.1 all
-apt-utils 1.8.1 amd64
+apt-transport-https 1.8.3 all
+apt-utils 1.8.3 amd64
-base-files 10.1ubuntu9.1 amd64
+base-files 10.1ubuntu9.2 amd64
-bluez 5.50-0ubuntu2 amd64
-bluez-cups 5.50-0ubuntu2 amd64
-bluez-obexd 5.50-0ubuntu2 amd64
+bluez 5.50-0ubuntu2.1 amd64
+bluez-cups 5.50-0ubuntu2.1 amd64
+bluez-obexd 5.50-0ubuntu2.1 amd64
-code 1.38.1-1568209190 amd64
+code 1.39.1-1570750687 amd64
-gnome-software 3.30.6-2ubuntu4.19.04.1 amd64
-gnome-software-common 3.30.6-2ubuntu4.19.04.1 all
-gnome-software-plugin-snap 3.30.6-2ubuntu4.19.04.1 amd64
+gnome-software 3.30.6-2ubuntu4.19.04.2 amd64
+gnome-software-common 3.30.6-2ubuntu4.19.04.2 all
+gnome-software-plugin-snap 3.30.6-2ubuntu4.19.04.2 amd64
-libapt-inst2.0 1.8.1 amd64
+libapt-inst2.0 1.8.3 amd64
-libapt-pkg5.0 1.8.1 amd64
+libapt-pkg5.0 1.8.3 amd64
+libbelcard1 1.0.2-1 amd64
+libbelr1 0.1.3-2 amd64
-libbluetooth3 5.50-0ubuntu2 amd64
+libbluetooth3 5.50-0ubuntu2.1 amd64
+liblinphone9 3.12.0-3 amd64
+libmediastreamer-base10 1:2.16.1-4build1 amd64
+libmediastreamer-voip10 1:2.16.1-4build1 amd64
-libmm-glib0 1.10.0-1 amd64
+libmm-glib0 1.10.0-1ubuntu0.19.04.1 amd64
+libortp13 1:1.0.2-1 amd64
-librados2 13.2.6-0ubuntu0.19.04.3 amd64
+librados2 13.2.6-0ubuntu0.19.04.4 amd64
-librbd1 13.2.6-0ubuntu0.19.04.3 amd64
+librbd1 13.2.6-0ubuntu0.19.04.4 amd64
-libsnmp-base 5.7.3+dfsg-5ubuntu1.1 all
+libsnmp-base 5.7.3+dfsg-5ubuntu1.2 all
-libssl-dev 1.1.1b-1ubuntu2.1 amd64
+libssl-dev 1.1.1b-1ubuntu2.4 amd64
-libssl1.1 1.1.1b-1ubuntu2.1 amd64
-libssl1.1 1.1.1b-1ubuntu2.1 i386
+libssl1.1 1.1.1b-1ubuntu2.4 amd64
+libssl1.1 1.1.1b-1ubuntu2.4 i386
-modemmanager 1.10.0-1 amd64
+modemmanager 1.10.0-1ubuntu0.19.04.1 amd64
-netplan.io 0.97-0ubuntu1~19.04.1 amd64
+netplan.io 0.98-0ubuntu1~19.04.1 amd64
-openssl 1.1.1b-1ubuntu2.1 amd64
+openssl 1.1.1b-1ubuntu2.4 amd64
-qemu-block-extra 1:3.1+dfsg-2ubuntu3.4 amd64
-qemu-kvm 1:3.1+dfsg-2ubuntu3.4 amd64
-qemu-system-common 1:3.1+dfsg-2ubuntu3.4 amd64
-qemu-system-data 1:3.1+dfsg-2ubuntu3.4 all
-qemu-system-gui 1:3.1+dfsg-2ubuntu3.4 amd64
-qemu-system-x86 1:3.1+dfsg-2ubuntu3.4 amd64
-qemu-utils 1:3.1+dfsg-2ubuntu3.4 amd64
+qemu-block-extra 1:3.1+dfsg-2ubuntu3.5 amd64
+qemu-kvm 1:3.1+dfsg-2ubuntu3.5 amd64
+qemu-system-common 1:3.1+dfsg-2ubuntu3.5 amd64
+qemu-system-data 1:3.1+dfsg-2ubuntu3.5 all
+qemu-system-gui 1:3.1+dfsg-2ubuntu3.5 amd64
+qemu-system-x86 1:3.1+dfsg-2ubuntu3.5 amd64
+qemu-utils 1:3.1+dfsg-2ubuntu3.5 amd64
-ubuntu-software 3.30.6-2ubuntu4.19.04.1 all
+ubuntu-software 3.30.6-2ubuntu4.19.04.2 all
---
 update-motd.d/50-motd-news | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/update-motd.d/50-motd-news b/update-motd.d/50-motd-news
index e031cdf..08d7f0d 100755
--- a/update-motd.d/50-motd-news
+++ b/update-motd.d/50-motd-news
@@ -67,7 +67,8 @@ fi
 # Generate our temp files, clean up when done
 NEWS=$(mktemp) || exit 1
 ERR=$(mktemp) || exit 1
-trap "rm -f $NEWS $ERR" HUP INT QUIT ILL TRAP KILL BUS TERM
+CLOUD=$(mktemp) || exit 1
+trap "rm -f $NEWS $ERR $CLOUD" HUP INT QUIT ILL TRAP KILL BUS TERM
 
 # Construct a user agent, similar to Firefox/Chrome/Safari/IE to
 # ensure a proper, tailored, accurate message of the day
@@ -84,13 +85,24 @@ codename="$DISTRIB_CODENAME"
 platform="$(uname -o)/$(uname -r)/$(uname -m)"
 arch="$(uname -m)"
 cpu="$(grep -m1 "^model name" /proc/cpuinfo | sed -e "s/.*: //" -e "s:\s\+:/:g")"
+cloud_id="unknown"
+if [ -x /usr/bin/cloud-id ]; then
+    /usr/bin/cloud-id > "$CLOUD" 2>/dev/null
+    if [ $? -eq 0 ]; then
+        # sanitize it a bit, just in case
+        cloud_id=$(cut -c -40 "${CLOUD}" | tr -c -d '[:alnum:]')
+        if [ -z "${cloud_id}" ]; then
+            cloud_id="unknown"
+        fi
+    fi
+fi
 
 # Some messages may only be pertinent before or after some amount of uptime
 read up idle < /proc/uptime
 uptime="uptime/$up/$idle"
 
 # Piece together the user agent
-USER_AGENT="curl/$curl_ver $lsb $platform $cpu $uptime"
+USER_AGENT="curl/$curl_ver $lsb $platform $cpu $uptime cloud_id/$cloud_id"
 
 # Loop over any configured URLs
 for u in $URLS; do
@@ -119,5 +131,5 @@ for u in $URLS; do
 		: > "$CACHE"
  	fi
 done
-rm -f "$NEWS" "$ERR"
+rm -f "$NEWS" "$ERR" "$CLOUD"
 exit 0
-- 
2.43.0