Merge ~oddbloke/ubuntu/+source/gce-compute-image-packages/+git/gce-compute-image-packages:rsyslog into ~ubuntu-dev/ubuntu/+source/gce-compute-image-packages/+git/gce-compute-image-packages:master

[Dan Watkins]

[Philip Roche (philroche)]

LGTM

review: Approve

[Jose L. VG (josvaz)]

LGTM!

Provided that it was tested and worked (which I assume it was)

review: Approve

diff --git a/debian/changelog b/debian/changelog
index fd056c1..4d3af3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gce-compute-image-packages (20160930-0ubuntu5) zesty; urgency=medium
+
+  * Install upstream-provided rsyslog configuration so that daemons can log to
+    the serial console. (LP: #1664949)
+
+ -- Daniel Watkins <[e-mail]>  Wed, 15 Feb 2017 11:40:12 +0000
+
 gce-compute-image-packages (20160930-0ubuntu4) zesty; urgency=medium
 
   * Reintroduce udev rules that configure GCE-specific behaviour.
diff --git a/debian/gce-compute-image-packages.install b/debian/gce-compute-image-packages.install
index 816a4cc..becee26 100644
--- a/debian/gce-compute-image-packages.install
+++ b/debian/gce-compute-image-packages.install
@@ -1,5 +1,6 @@
 # Upstream-provided configuration
 google_compute_engine_init/systemd/*.service lib/systemd/system
+google_config/rsyslog/* etc/rsyslog.d
 google_config/udev/* lib/udev/rules.d
 
 # Ubuntu-specific configuration