Merge ~ahasenack/ubuntu/+source/base-files:groovy-remove-uptime into ubuntu/+source/base-files:ubuntu/devel

[Andreas Hasenack]

Stop including the uptime in the user-agent string. I opted to zero the value instead of removing the field entirely to avoid breaking possible parsers out there.

[Andreas Hasenack (ahasenack)]

I just pushed another commit not including uptime at all. We should be the only consumers, and if it breaks something, we will know.

[Bryce Harrington (bryce)]

If we're the only consumers then yep, looks good to drop entirely.

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, tagging and uploading 0f66926d99392707e0278a028e5d3f8448cfb277

$ git push pkg upload/11ubuntu8
Enumerating objects: 18, done.
Counting objects: 100% (18/18), done.
Delta compression using up to 4 threads
Compressing objects: 100% (13/13), done.
Writing objects: 100% (13/13), 1.46 KiB | 135.00 KiB/s, done.
Total 13 (delta 9), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/base-files
 * [new tag] upload/11ubuntu8 -> upload/11ubuntu8

$ dput ubuntu ../base-files_11ubuntu8_source.changes
Checking signature on .changes
gpg: ../base-files_11ubuntu8_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../base-files_11ubuntu8.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading base-files_11ubuntu8.dsc: done.
  Uploading base-files_11ubuntu8.tar.xz: done.
  Uploading base-files_11ubuntu8_source.buildinfo: done.
  Uploading base-files_11ubuntu8_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 262b63a..c92e176 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+base-files (11ubuntu8) groovy; urgency=medium
+
+  * motd/50-motd-news: don't include uptime in the user-agent string
+    (LP: #1886572)
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 06 Jul 2020 19:50:22 -0300
+
 base-files (11ubuntu7) groovy; urgency=medium
 
   [ Simon Deziel ]
diff --git a/motd/50-motd-news b/motd/50-motd-news
index b697c78..a0d5424 100644
--- a/motd/50-motd-news
+++ b/motd/50-motd-news
@@ -100,12 +100,8 @@ if [ -x /usr/bin/cloud-id ]; then
     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 cloud_id/$cloud_id"
+USER_AGENT="curl/$curl_ver $lsb $platform $cpu cloud_id/$cloud_id"
 
 # Loop over any configured URLs
 for u in $URLS; do