Merge ~chad.smith/ubuntu/+source/pollinate:ubuntu/bionic-devel into ubuntu/+source/pollinate:ubuntu/bionic-devel

[Chad Smith]

Sync 4.33 from upstream ubuntu/devel into ubuntu/bionic-devel. No packaging changes made.

300a680... by Chad Smith on 2018-05-30

Import version 4.33-0ubuntu1~18.04.1 to ubuntu/bionic-proposed

New changelog entries:
  * New upstream release (LP: #1761240):
    - Fix bug on xen when not booted with systemd.
    - Use systemd-detect-virt if available.
    - Include img/build_name/server in user-agent.

[Scott Moser (smoser)]

I uploaded this as it is excewpt for changed the distribution in debian/changelog from bionic-updates to just bionic.

Thanks.

review: Approve

[Scott Moser (smoser)]

marking merged as uploaded to queue.

diff --git a/ChangeLog b/ChangeLog
index 79a87e2..40a1039 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,25 @@
-pollinate (4.31) released; urgency=medium
+pollinate (4.33) released; urgency=medium
+
+  * pollinate: fix bug on xen when not booted with systemd. user-agent
+    would contain virt/virt/xen rather than virt/xen. (LP: #1774043)
+  * pollinate: use systemd-detect-virt if available rather than detecting
+    its availability based on /run/systemd.
+
+ -- Scott Moser <[e-mail]>  Fri, 25 May 2018 12:30:15 -0400
+
+pollinate (4.32-0ubuntu1) cosmic; urgency=medium
+
+  * pollinate: include img/build_name/server in user-agent.
+
+ -- Scott Moser <[e-mail]>  Fri, 25 May 2018 12:30:06 -0400
+
+pollinate (4.31-0ubuntu1) bionic; urgency=medium
 
   [ Scott Moser ]
   * pollinate: add '--print-user-agent' flag.
   * pollinate: Speedups when collecting information for user-agent.
 
- -- Dustin Kirkland <[e-mail]>  Wed, 31 Jan 2018 07:24:35 -0600
+ -- Dustin Kirkland <[e-mail]>  Wed, 14 Feb 2018 11:01:18 -0600
 
 pollinate (4.30-0ubuntu1) bionic; urgency=medium
 
diff --git a/debian/changelog b/debian/changelog
index fd8b2dd..a369baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pollinate (4.33-0ubuntu1~18.04.1) bionic-updates; urgency=medium
+
+  * New upstream release (LP: #1761240):
+    - Fix bug on xen when not booted with systemd.
+    - Use systemd-detect-virt if available.
+    - Include img/build_name/server in user-agent.
+
+ -- Chad Smith <[e-mail]>  Wed, 30 May 2018 10:36:52 -0600
+
 pollinate (4.31-0ubuntu1) bionic; urgency=medium
 
   [ Scott Moser ]
diff --git a/pollinate b/pollinate
index 4f71070..4a4cbbd 100755
--- a/pollinate
+++ b/pollinate
@@ -92,13 +92,12 @@ hash_and_write() {
 read_build_info() {
 	# ubuntu images place build information in /etc/cloud/build.info
 	# format of file is '<key>: <value>' put these under img/<key>/<value>
-	# do not report 'build_name: server', there are not other known values.
 	local bifile="${1:-/etc/cloud/build.info}" ret=""
 	_RET=""
 	[ -s "$bifile" ] || return 0
 	ret=$(awk '{
 		gsub(/#.*/, ""); gsub(/\s+$/, "");
-		if ($0 == "" || $0 !~ /:/ || $0 == "build_name: server") next;
+		if ($0 == "" || $0 !~ /:/) next;
 		gsub(/:\s*/, "/");
 		printf("img/%s ", $0) }' "$bifile") || return
 	_RET="${ret% }"
@@ -124,14 +123,14 @@ read_virt() {
 	# system is running on.
 	local ret=""
 	_RET=""
-	if [ -d /run/systemd ]; then
+	if command -v systemd-detect-virt >/dev/null; then
 		ret=$(systemd-detect-virt)
 		# systemd-detect-virt returns 1 for 'none'
 		[ $? -eq 0 -o "$ret" = "none" ] || ret=""
 	else
 		# trusty would take this path.
 		if [ -d /dev/xen ]; then
-			ret="virt/xen"
+			ret="xen"
 		elif [ -d /dev/lxd ]; then
 			# call this 'lxc' for consistency with systemd-detect-virt.
 			ret="lxc"