diff -Nru google-guest-agent-20200617.00/debian/changelog google-guest-agent-20200617.00/debian/changelog --- google-guest-agent-20200617.00/debian/changelog 2020-10-02 22:47:33.000000000 +0000 +++ google-guest-agent-20200617.00/debian/changelog 2020-10-22 15:29:37.000000000 +0000 @@ -1,3 +1,11 @@ +google-guest-agent (20200617.00-0ubuntu6~rbalinttest1) groovy; urgency=medium + + * Import relevant patches from earlier gce-compute-image-packages package + (LP: #1901033) + * XXX test dpkg nocheck readding + + -- Balint Reczey Thu, 22 Oct 2020 17:29:37 +0200 + google-guest-agent (20200617.00-0ubuntu5) groovy; urgency=medium * debian/rules: Don't stop or start google-startup-scripts and diff -Nru google-guest-agent-20200617.00/debian/patches/0003-order-startup-scripts-after-snap-seeding.service google-guest-agent-20200617.00/debian/patches/0003-order-startup-scripts-after-snap-seeding.service --- google-guest-agent-20200617.00/debian/patches/0003-order-startup-scripts-after-snap-seeding.service 1970-01-01 00:00:00.000000000 +0000 +++ google-guest-agent-20200617.00/debian/patches/0003-order-startup-scripts-after-snap-seeding.service 2020-10-22 15:29:37.000000000 +0000 @@ -0,0 +1,20 @@ +From: Daniel Watkins +Date: Fri, 12 Apr 2019 13:23:42 +0200 +Subject: Ensure that snaps have been seeded before startup scripts run + +Last-Update: 2018-05-15 +--- + .../google-startup-scripts.service | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/google-startup-scripts.service ++++ b/google-startup-scripts.service +@@ -5,6 +5,8 @@ + Before=apt-daily.service + After=cloud-final.service multi-user.target + Wants=cloud-final.service ++After=snapd.seeded.service ++Wants=snapd.seeded.service + + [Service] + Type=oneshot diff -Nru google-guest-agent-20200617.00/debian/patches/0004-order-shutdown-scripts-after-snapd.patch google-guest-agent-20200617.00/debian/patches/0004-order-shutdown-scripts-after-snapd.patch --- google-guest-agent-20200617.00/debian/patches/0004-order-shutdown-scripts-after-snapd.patch 1970-01-01 00:00:00.000000000 +0000 +++ google-guest-agent-20200617.00/debian/patches/0004-order-shutdown-scripts-after-snapd.patch 2020-10-22 15:29:37.000000000 +0000 @@ -0,0 +1,20 @@ +From: Daniel Watkins +Date: Fri, 12 Apr 2019 13:23:42 +0200 +Subject: Order shutdown scripts after snapd.service + +This ensures that snaps will be available when the scripts run on shutdown +Last-Update: 2018-05-17 +--- + .../google-shutdown-scripts.service | 1 + + 1 file changed, 1 insertion(+) + +--- a/google-shutdown-scripts.service ++++ b/google-shutdown-scripts.service +@@ -2,6 +2,7 @@ + Description=Google Compute Engine Shutdown Scripts + Wants=network-online.target rsyslog.service + After=network-online.target rsyslog.service ++After=snapd.service + + [Service] + Type=oneshot diff -Nru google-guest-agent-20200617.00/debian/patches/fix-startup-script-ordering.patch google-guest-agent-20200617.00/debian/patches/fix-startup-script-ordering.patch --- google-guest-agent-20200617.00/debian/patches/fix-startup-script-ordering.patch 1970-01-01 00:00:00.000000000 +0000 +++ google-guest-agent-20200617.00/debian/patches/fix-startup-script-ordering.patch 2020-10-22 15:29:37.000000000 +0000 @@ -0,0 +1,26 @@ +From: Ubuntu Developers +Date: Fri, 12 Apr 2019 13:23:42 +0200 +Subject: 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 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1436846 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1627436 +Last-Update: 2016-11-23 +--- + .../google-startup-scripts.service | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/google-startup-scripts.service ++++ b/google-startup-scripts.service +@@ -3,6 +3,8 @@ + Wants=network-online.target rsyslog.service + After=network-online.target rsyslog.service google-guest-agent.service + Before=apt-daily.service ++After=cloud-final.service multi-user.target ++Wants=cloud-final.service + + [Service] + Type=oneshot diff -Nru google-guest-agent-20200617.00/debian/patches/series google-guest-agent-20200617.00/debian/patches/series --- google-guest-agent-20200617.00/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ google-guest-agent-20200617.00/debian/patches/series 2020-10-22 15:29:37.000000000 +0000 @@ -0,0 +1,3 @@ +fix-startup-script-ordering.patch +0003-order-startup-scripts-after-snap-seeding.service +0004-order-shutdown-scripts-after-snapd.patch diff -Nru google-guest-agent-20200617.00/debian/rules google-guest-agent-20200617.00/debian/rules --- google-guest-agent-20200617.00/debian/rules 2020-10-02 22:47:33.000000000 +0000 +++ google-guest-agent-20200617.00/debian/rules 2020-10-22 15:29:37.000000000 +0000 @@ -1,5 +1,8 @@ #!/usr/bin/make -f +# check if nocheck can be readded +DEB_BUILD_OPTIONS := $(filter-out nocheck,$(DEB_BUILD_OPTIONS)) + %: dh $@ --builddirectory=_build --buildsystem=golang --with=golang