Merge ~philroche/ubuntu/+source/gce-compute-image-packages/+git/gce-compute-image-packages:yakkety into ~ubuntu-dev/ubuntu/+source/gce-compute-image-packages/+git/gce-compute-image-packages:yakkety

[Philip Roche]

GCE mirrors not in place before startup scripts are run (LP: #1436846)

Migrating the following startup scripts ordering from legacy gce-statup-scripts
package to gce-compute-image-packages

* GCE mirrors not in place before startup scripts are run (LP: #1436846)

Run google-startup-scripts.service after multi-user.target (LP: #1627436)

Migrating the following startup scripts ordering from legacy gce-statup-scripts
package to gce-compute-image-packages

* Run google-startup-scripts.service explicitly after multi-user.target
 to resolve ordering cycle between implicit Before multi-user.target
 and explicit After cloud-final.target. (LP: #1627436)

diff --git a/debian/changelog b/debian/changelog
index 8062f79..5e4c81b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gce-compute-image-packages (20160930-0ubuntu3~16.10.0) yakkety; 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)
+
+ -- Philip Roche <[e-mail]>  Fri, 25 Nov 2016 11:37:17 +0000
+
 gce-compute-image-packages (20160930-0ubuntu2) yakkety; urgency=medium
 
   * Document all elements of the source package in debian/copyright.
diff --git a/debian/patches/fix-startup-script-ordering.patch b/debian/patches/fix-startup-script-ordering.patch
new file mode 100644
index 0000000..1c65a25
--- /dev/null
+++ b/debian/patches/fix-startup-script-ordering.patch
@@ -0,0 +1,24 @@
+Description: Fix where GCE startup scripts are run during boot
+  This fixes:
+   * GCE mirrors not in place before startup scripts are run (LP: #1436846)
+   * Run google-startup-scripts.service after multi-user.target (LP: #1627436)
+
+Author: Phil Roche <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1436846
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1627436
+Last-Update: 2016-11-23
+
+Index: gce-compute-image-packages-20160930/google_compute_engine_init/systemd/google-startup-scripts.service
+===================================================================
+--- gce-compute-image-packages-20160930.orig/google_compute_engine_init/systemd/google-startup-scripts.service
++++ gce-compute-image-packages-20160930/google_compute_engine_init/systemd/google-startup-scripts.service
+@@ -2,7 +2,8 @@
+ Description=Google Compute Engine Startup Scripts
+ After=local-fs.target network-online.target network.target rsyslog.service
+ After=google-instance-setup.service google-network-setup.service
+-Wants=local-fs.target network-online.target network.target
++After=cloud-final.service multi-user.target
++Wants=local-fs.target network-online.target network.target cloud-final.service
+
+ [Service]
+ ExecStart=/usr/bin/google_metadata_script_runner --script-type startup
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0787004
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-startup-script-ordering.patch
diff --git a/google_compute_engine_init/systemd/google-startup-scripts.service b/google_compute_engine_init/systemd/google-startup-scripts.service
index 9c04d79..f4b27b8 100644
--- a/google_compute_engine_init/systemd/google-startup-scripts.service
+++ b/google_compute_engine_init/systemd/google-startup-scripts.service
@@ -2,7 +2,8 @@
 Description=Google Compute Engine Startup Scripts
 After=local-fs.target network-online.target network.target rsyslog.service
 After=google-instance-setup.service google-network-setup.service
-Wants=local-fs.target network-online.target network.target
+After=cloud-final.service multi-user.target
+Wants=local-fs.target network-online.target network.target cloud-final.service
 
 [Service]
 ExecStart=/usr/bin/google_metadata_script_runner --script-type startup