Ubuntu
gce-compute-image-packages package

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

  1. Git
  2. lp:~oddbloke/ubuntu/+source/gce-compute-image-packages
  3. trusty-merge
  4. Merge into trusty
Proposed by Dan Watkins
Status: Rejected
Rejected by: Dan Watkins
Proposed branch: ~oddbloke/ubuntu/+source/gce-compute-image-packages:trusty-merge
Merge into: ~ubuntu-dev/ubuntu/+source/gce-compute-image-packages/+git/gce-compute-image-packages:trusty
Diff against target: 100 lines (+62/-0) (has conflicts)
4 files modified
debian/99-gce.rules (+2/-0)
debian/changelog (+44/-0)
debian/gce-compute-image-packages.install (+8/-0)
debian/rules (+8/-0)
Conflict in debian/changelog
Conflict in debian/gce-compute-image-packages.install
Conflict in debian/rules
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+323353@code.launchpad.net
To post a comment you must log in.

Unmerged commits

5037621... by Dan Watkins

Add changelog for trusty backport

9acb8e5... by Dan Watkins

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

Merge latest packaging in to trusty's version

a209584... by Philip Roche

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

Imported using usd-importer.

Publish parent: 7c92cb0a1a27edc96413932e3c697856576db92d

5b1c59b... by Philip Roche

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

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

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

Imported using usd-importer.

Publish parent: 1d1452c402e7bde9f9bfc03e355d29b84194be6b
Changelog parent: 397888d878cc4ecb1a1190edefeda4ccb5168fba

397888d... by Philip Roche

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

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

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/99-gce.rules b/debian/99-gce.rules
0new file mode 1006440new file mode 100644
index 0000000..e969df0
--- /dev/null
+++ b/debian/99-gce.rules
@@ -0,0 +1,2 @@
1# Give syslog write access to the kernel logs
2KERNEL=="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 @@
1<<<<<<< debian/changelog
2=======
3gce-compute-image-packages (20160930-0ubuntu6~14.04.0) trusty; urgency=medium
4
5 * Backport latest gce-compute-image-packages to trusty
6 * Remove the udev rule that configures the noop scheduler as the udev
7 package handles that in trusty
8
9 -- Daniel Watkins <daniel.watkins@canonical.com> Thu, 27 Apr 2017 15:51:12 -0400
10
11gce-compute-image-packages (20160930-0ubuntu6) zesty; urgency=medium
12
13 * Do not restart startup or shutdown scripts on upgrade (LP: #1668327)
14
15 -- Phil Roche <phil.roche@canonical.com> Mon, 20 Mar 2017 14:47:51 +0000
16
17gce-compute-image-packages (20160930-0ubuntu5) zesty; urgency=medium
18
19 * Install upstream-provided rsyslog configuration so that daemons can log to
20 the serial console. (LP: #1664949)
21
22 -- Daniel Watkins <daniel.watkins@canonical.com> Wed, 15 Feb 2017 11:40:12 +0000
23
24gce-compute-image-packages (20160930-0ubuntu4) zesty; urgency=medium
25
26 * Reintroduce udev rules that configure GCE-specific behaviour.
27 (LP: #1662491)
28
29 -- Daniel Watkins <daniel.watkins@canonical.com> Mon, 06 Feb 2017 16:22:37 +0000
30
31gce-compute-image-packages (20160930-0ubuntu3) zesty; urgency=medium
32
33 * GCE mirrors not in place before startup scripts are run (LP: #1436846)
34 * Run google-startup-scripts.service after multi-user.target (LP: #1627436)
35
36 -- Phil Roche <phil.roche@canonical.com> Thu, 17 Nov 2016 15:09:00 +0000
37
38gce-compute-image-packages (20160930-0ubuntu3~14.04.2) trusty; urgency=medium
39
40 * Do not restart startup or shutdown scripts on upgrade (LP: #1668327)
41
42 -- Phil Roche <phil.roche@canonical.com> Tue, 21 Mar 2017 17:11:51 +0000
43
44>>>>>>> debian/changelog
1gce-compute-image-packages (20160930-0ubuntu3~14.04.1) trusty; urgency=medium45gce-compute-image-packages (20160930-0ubuntu3~14.04.1) trusty; urgency=medium
246
3 * Fix where GCE shutdown scripts are run during shutdown when using Upstart (LP: #1667277)47 * 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 @@
1# Upstream-provided configuration1# Upstream-provided configuration
2google_compute_engine_init/systemd/*.service lib/systemd/system2google_compute_engine_init/systemd/*.service lib/systemd/system
3google_compute_engine_init/upstart/*.conf etc/init3google_compute_engine_init/upstart/*.conf etc/init
4<<<<<<< debian/gce-compute-image-packages.install
5=======
6google_config/rsyslog/* etc/rsyslog.d
7>>>>>>> debian/gce-compute-image-packages.install
4google_config/udev/* lib/udev/rules.d8google_config/udev/* lib/udev/rules.d
59
6# Ubuntu-specific configuration10# Ubuntu-specific configuration
7debian/instance_configs.cfg.distro etc/default11debian/instance_configs.cfg.distro etc/default
8debian/91-gce.cfg etc/cloud/cloud.cfg.d12debian/91-gce.cfg etc/cloud/cloud.cfg.d
13<<<<<<< debian/gce-compute-image-packages.install
14=======
15debian/99-gce.rules lib/udev/rules.d
16>>>>>>> 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/
7%:7%:
8 dh $@ --with python2,systemd --buildsystem=pybuild8 dh $@ --with python2,systemd --buildsystem=pybuild
99
10<<<<<<< debian/rules
11=======
12override_dh_installinit:
13 dh_installinit --name=google-startup-scripts --onlyscripts --no-start --no-restart-on-upgrade
14 dh_installinit --name=google-shutdown-scripts --onlyscripts --no-start --no-restart-on-upgrade
15 dh_installinit --name=google-shutdown-scripts-block-rsyslog --onlyscripts --no-start --no-restart-on-upgrade
16
17>>>>>>> debian/rules
10override_dh_clean:18override_dh_clean:
11 rm -rf google_compute_engine.egg-info19 rm -rf google_compute_engine.egg-info
12 dh_clean20 dh_clean

Subscribers

People subscribed via source and target branches