Ubuntu
gce-compute-image-packages package

Merge ~philroche/ubuntu/+source/gce-compute-image-packages/+git/gce-compute-image-packages:feature/startup-scripts-ordering into ~ubuntu-dev/ubuntu/+source/gce-compute-image-packages/+git/gce-compute-image-packages:master

  1. Git
  2. lp:~philroche/ubuntu/+source/gce-compute-image-packages/+git/gce-compute-image-packages
  3. feature/startup-scripts-ordering
  4. Merge into master
Proposed by Philip Roche on 2016-11-17
Status: Merged
Merged at revision: 8251cc57156beef5c001afa95af9531f5b51dd3a
Proposed branch: ~philroche/ubuntu/+source/gce-compute-image-packages/+git/gce-compute-image-packages:feature/startup-scripts-ordering
Merge into: ~ubuntu-dev/ubuntu/+source/gce-compute-image-packages/+git/gce-compute-image-packages:master
Diff against target: 29 lines (+9/-1)
2 files modified
debian/changelog (+7/-0)
google_compute_engine_init/systemd/google-startup-scripts.service (+2/-1)
Reviewer Review Type Date Requested Status
Dan Watkins 2016-11-17 Approve on 2016-11-23
Jose L. VG (community) Approve on 2016-11-17
Review via email: mp+311153@code.launchpad.net

Description of the Change

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

Migrating the following startup scripts ordering from legacy gce-startup-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-startup-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)

These changes have been successfully tested

To post a comment you must log in.
Jose L. VG (josvaz) wrote :

LGTM!

Makes sense reading the commits.
I approve because I belive you have tested this already.

review: Approve
Dan Watkins (daniel-thewatkins) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 8062f79..93960f2 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+gce-compute-image-packages (20160930-0ubuntu3) zesty; urgency=medium
7+
8+ * GCE mirrors not in place before startup scripts are run (LP: #1436846)
9+ * Run google-startup-scripts.service after multi-user.target (LP: #1627436)
10+
11+ -- Phil Roche <phil.roche@canonical.com> Thu, 17 Nov 2016 15:09:00 +0000
12+
13 gce-compute-image-packages (20160930-0ubuntu2) yakkety; urgency=medium
14
15 * Document all elements of the source package in debian/copyright.
16diff --git a/google_compute_engine_init/systemd/google-startup-scripts.service b/google_compute_engine_init/systemd/google-startup-scripts.service
17index 9c04d79..f4b27b8 100644
18--- a/google_compute_engine_init/systemd/google-startup-scripts.service
19+++ b/google_compute_engine_init/systemd/google-startup-scripts.service
20@@ -2,7 +2,8 @@
21 Description=Google Compute Engine Startup Scripts
22 After=local-fs.target network-online.target network.target rsyslog.service
23 After=google-instance-setup.service google-network-setup.service
24-Wants=local-fs.target network-online.target network.target
25+After=cloud-final.service multi-user.target
26+Wants=local-fs.target network-online.target network.target cloud-final.service
27
28 [Service]
29 ExecStart=/usr/bin/google_metadata_script_runner --script-type startup

Subscribers

People subscribed via source and target branches