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

[Dan Watkins]

Unmerged commits

5037621... by Dan Watkins on 2017-04-27

Add changelog for trusty backport

9acb8e5... by Dan Watkins on 2017-04-27

Remove scheduler change from 99-gce.rules

On trusty, the same rule is installed (in a different path) by the udev
package. Installing it twice doesn't matter by default, but GCE were
seeing users trying to disable it and failing to find both of the
duplicates.

9419a3f... by Dan Watkins on 2017-04-27

Merge latest packaging in to trusty's version

a209584... by Philip Roche on 2017-03-20

Import patches-unapplied version 20160930-0ubuntu6 to ubuntu/artful

Imported using usd-importer.

Publish parent: 7c92cb0a1a27edc96413932e3c697856576db92d

5b1c59b... by Philip Roche on 2017-03-21

Import patches-unapplied version 20160930-0ubuntu3~14.04.2 to ubuntu/trusty-updates

Imported using usd-importer.

Publish parent: 9f301522323d4fce1f90f5704cec996fa166fab9
Changelog parent: ac2be00fb6efdc45b9eb5cc4a43bb159960b2bf8

ac2be00... by Philip Roche on 2017-03-21

Import patches-unapplied version 20160930-0ubuntu3~14.04.2 to ubuntu/trusty-proposed

Imported using usd-importer.

Publish parent: c28cb381571f50e47692f6c13b58c22881859b13

New changelog entries:
  * Do not restart startup or shutdown scripts on upgrade (LP: #1668327)

7c92cb0... by Philip Roche on 2017-03-20

Import patches-unapplied version 20160930-0ubuntu6 to ubuntu/zesty

Imported using usd-importer.

Publish parent: 1d1452c402e7bde9f9bfc03e355d29b84194be6b
Changelog parent: 397888d878cc4ecb1a1190edefeda4ccb5168fba

397888d... by Philip Roche on 2017-03-20

Import patches-unapplied version 20160930-0ubuntu6 to ubuntu/zesty-proposed

Imported using usd-importer.

Publish parent: d81614bf5fcd46b1612763304bc68ca36be0da4a

New changelog entries:
  * Do not restart startup or shutdown scripts on upgrade (LP: #1668327)

9f30152... by Philip Roche on 2017-02-23

Import patches-unapplied version 20160930-0ubuntu3~14.04.1 to ubuntu/trusty-updates

Imported using usd-importer.

Publish parent: be4cd332d54cb8ce6bddeb64aa3dabc229210692
Changelog parent: c28cb381571f50e47692f6c13b58c22881859b13

c28cb38... by Philip Roche on 2017-02-23

Import patches-unapplied version 20160930-0ubuntu3~14.04.1 to ubuntu/trusty-proposed

Imported using usd-importer.

Publish parent: 2c5765a482c1a5c34bb9987b9936d1a6cb5583fd

New changelog entries:
  * Fix where GCE shutdown scripts are run during shutdown when using Upstart (LP: #1667277)

diff --git a/debian/99-gce.rules b/debian/99-gce.rules
new file mode 100644
index 0000000..e969df0
--- /dev/null
+++ b/debian/99-gce.rules
@@ -0,0 +1,2 @@
+# Give syslog write access to the kernel logs
+KERNEL=="console", GROUP="syslog", MODE="0620"
diff --git a/debian/changelog b/debian/changelog
index 8800035..c2ebc7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,47 @@
+<<<<<<< debian/changelog
+=======
+gce-compute-image-packages (20160930-0ubuntu6~14.04.0) trusty; urgency=medium
+
+  * Backport latest gce-compute-image-packages to trusty
+  * Remove the udev rule that configures the noop scheduler as the udev
+    package handles that in trusty
+
+ -- Daniel Watkins <[e-mail]>  Thu, 27 Apr 2017 15:51:12 -0400
+
+gce-compute-image-packages (20160930-0ubuntu6) zesty; urgency=medium
+
+  * Do not restart startup or shutdown scripts on upgrade (LP: #1668327)
+
+ -- Phil Roche <[e-mail]>  Mon, 20 Mar 2017 14:47:51 +0000
+
+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.
+    (LP: #1662491)
+
+ -- Daniel Watkins <[e-mail]>  Mon, 06 Feb 2017 16:22:37 +0000
+
+gce-compute-image-packages (20160930-0ubuntu3) zesty; urgency=medium
+
+  * GCE mirrors not in place before startup scripts are run (LP: #1436846)
+  * Run google-startup-scripts.service after multi-user.target (LP: #1627436)
+
+ -- Phil Roche <[e-mail]>  Thu, 17 Nov 2016 15:09:00 +0000
+
+gce-compute-image-packages (20160930-0ubuntu3~14.04.2) trusty; urgency=medium
+
+  * Do not restart startup or shutdown scripts on upgrade (LP: #1668327)
+
+ -- Phil Roche <[e-mail]>  Tue, 21 Mar 2017 17:11:51 +0000
+
+>>>>>>> debian/changelog
 gce-compute-image-packages (20160930-0ubuntu3~14.04.1) trusty; urgency=medium
 
   * Fix where GCE shutdown scripts are run during shutdown when using Upstart (LP: #1667277)
diff --git a/debian/gce-compute-image-packages.install b/debian/gce-compute-image-packages.install
index df307f6..bac6498 100644
--- a/debian/gce-compute-image-packages.install
+++ b/debian/gce-compute-image-packages.install
@@ -1,8 +1,16 @@
 # Upstream-provided configuration
 google_compute_engine_init/systemd/*.service lib/systemd/system
 google_compute_engine_init/upstart/*.conf etc/init
+<<<<<<< debian/gce-compute-image-packages.install
+=======
+google_config/rsyslog/* etc/rsyslog.d
+>>>>>>> debian/gce-compute-image-packages.install
 google_config/udev/* lib/udev/rules.d
 
 # Ubuntu-specific configuration
 debian/instance_configs.cfg.distro etc/default
 debian/91-gce.cfg etc/cloud/cloud.cfg.d
+<<<<<<< debian/gce-compute-image-packages.install
+=======
+debian/99-gce.rules lib/udev/rules.d
+>>>>>>> debian/gce-compute-image-packages.install
diff --git a/debian/rules b/debian/rules
index 6555fdc..bf4f989 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,14 @@ export PYBUILD_TEST_ARGS={dir}/google_compute_engine/
 %:
 	dh $@ --with python2,systemd --buildsystem=pybuild
 
+<<<<<<< debian/rules
+=======
+override_dh_installinit:
+	dh_installinit --name=google-startup-scripts --onlyscripts --no-start --no-restart-on-upgrade 
+	dh_installinit --name=google-shutdown-scripts --onlyscripts --no-start --no-restart-on-upgrade
+	dh_installinit --name=google-shutdown-scripts-block-rsyslog --onlyscripts --no-start --no-restart-on-upgrade
+
+>>>>>>> debian/rules
 override_dh_clean:
 	rm -rf google_compute_engine.egg-info
 	dh_clean