diff -Nru gce-compute-image-packages-20160930/debian/changelog gce-compute-image-packages-20160930/debian/changelog --- gce-compute-image-packages-20160930/debian/changelog 2017-01-31 11:49:18.000000000 +0000 +++ gce-compute-image-packages-20160930/debian/changelog 2017-02-23 18:49:58.000000000 +0000 @@ -1,3 +1,9 @@ +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) + + -- Phil Roche Wed, 22 Feb 2017 11:28:38 +0000 + gce-compute-image-packages (20160930-0ubuntu3~14.04.0) trusty; urgency=medium * Backport gce-compute-image-packages to trusty (LP: #1643585) diff -Nru gce-compute-image-packages-20160930/debian/patches/fix-shutdown-script-ordering-upstart.patch gce-compute-image-packages-20160930/debian/patches/fix-shutdown-script-ordering-upstart.patch --- gce-compute-image-packages-20160930/debian/patches/fix-shutdown-script-ordering-upstart.patch 1970-01-01 01:00:00.000000000 +0100 +++ gce-compute-image-packages-20160930/debian/patches/fix-shutdown-script-ordering-upstart.patch 2017-02-23 12:43:25.000000000 +0000 @@ -0,0 +1,24 @@ +Description: Fix where GCE shutdown scripts are run during shutdown when using Upstart + This fixes: + * Shutdown scripts do not run on 1404 images with gce-compute-image-packages installed (LP: #1667277) + +Author: Phil Roche +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1667277 +Last-Update: 2017-02-22 + +--- /dev/null ++++ gce-compute-image-packages/google_compute_engine_init/upstart/google-shutdown-scripts-block-rsyslog.conf +@@ -0,0 +1,13 @@ ++# This job blocks until the google-shutdown-scripts job is completed on shutdown ++# and ensures rsyslog is still running. ++start on stopping rsyslog ++task ++ ++script ++ current_runlevel=$(runlevel | cut -d ' ' -f2) ++ case $current_runlevel in ++ 0|6) ++ start wait-for-state WAITER=google-shutdown-scripts-block-rsyslog WAIT_FOR=google-shutdown-scripts ++ ;; ++ esac ++end script diff -Nru gce-compute-image-packages-20160930/debian/patches/series gce-compute-image-packages-20160930/debian/patches/series --- gce-compute-image-packages-20160930/debian/patches/series 2017-01-31 11:49:18.000000000 +0000 +++ gce-compute-image-packages-20160930/debian/patches/series 2017-02-23 12:43:24.000000000 +0000 @@ -1,2 +1,3 @@ +fix-shutdown-script-ordering-upstart.patch fix-startup-script-ordering-upstart.patch fix-startup-script-ordering.patch