Merge ~xnox/cloud-init:devel into cloud-init:ubuntu/devel

[Dimitri John Ledkov]

Disable upstart support, as upstart is no longer shipped in artful.

Disable upstart support, as upstart is no longer shipped in artful.

[Dimitri John Ledkov (xnox)]

This is the last package from default container that ships upstart jobs.
Everything else is either fixed, stuck in proposed, or has a merge proposal awaiting review.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:b4deeaca6d0531d55fdb7bf3002a0ccff1521e81
https://jenkins.ubuntu.com/server/job/cloud-init-ci/192/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/192/rebuild

review: Approve (continuous-integration)

[Dimitri John Ledkov (xnox)]

In the default lxd container, this is now the last package shipping /etc/init/* jobs.

[Ryan Harper (raharper)]

There are some other places upstart is touched (/etc/cloud/cloud.cfg emit_upstart, cc_ubuntu_init_switch, cc_mounts, handlers/upstart_job)

It's also possible for other distros besides Ubuntu to use cloud-init's upstart jobs.

We can take this as a task for Artful to no longer package the upstart scripts but we'll likely not drop them from the repository.

[Scott Moser (smoser)]

This is fine with me.
I'm not familiar with 'rm_conffile' but i have faith that Dimitri knows how to use it correctly.

[Scott Moser (smoser)]

Spurred on by this suggestion, I wrote an email to mailing list
 https://lists.launchpad.net/cloud-init/msg00095.html

diff --git a/debian/changelog b/debian/changelog
index ea6872e..78eed58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cloud-init (0.7.9-243-ge74d775-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Disable upstart support, as upstart is no longer shipped in artful.
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 24 Aug 2017 00:29:30 +0100
+
 cloud-init (0.7.9-243-ge74d775-0ubuntu1) artful; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/cloud-init.lintian-overrides b/debian/cloud-init.lintian-overrides
deleted file mode 100644
index 591b651..0000000
--- a/debian/cloud-init.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# this explicitly diverts ureadahead.conf in ureadahead package
-# see LP: #499520 for more discussion
-cloud-init binary: diversion-for-unknown-file
diff --git a/debian/cloud-init.maintscript b/debian/cloud-init.maintscript
new file mode 100644
index 0000000..93aff81
--- /dev/null
+++ b/debian/cloud-init.maintscript
@@ -0,0 +1,8 @@
+rm_conffile /etc/init/cloud-config.conf 0.7.9-243-ge74d775-0ubuntu2~
+rm_conffile /etc/init/cloud-final.conf 0.7.9-243-ge74d775-0ubuntu2~
+rm_conffile /etc/init/cloud-init-blocknet.conf 0.7.9-243-ge74d775-0ubuntu2~
+rm_conffile /etc/init/cloud-init-container.conf 0.7.9-243-ge74d775-0ubuntu2~
+rm_conffile /etc/init/cloud-init-local.conf 0.7.9-243-ge74d775-0ubuntu2~
+rm_conffile /etc/init/cloud-init-nonet.conf 0.7.9-243-ge74d775-0ubuntu2~
+rm_conffile /etc/init/cloud-init.conf 0.7.9-243-ge74d775-0ubuntu2~
+rm_conffile /etc/init/cloud-log-shutdown.conf 0.7.9-243-ge74d775-0ubuntu2~
diff --git a/debian/cloud-init.postinst b/debian/cloud-init.postinst
index 420420b..f88d1c5 100644
--- a/debian/cloud-init.postinst
+++ b/debian/cloud-init.postinst
@@ -276,11 +276,14 @@ fix_azure_upgrade_1611074() {
     rm "$tmpf" || :
 }
 
+cleanup_ureadahead() {
+    local oldver="$1" last_bad_ver="0.7.9-243-ge74d775-0ubuntu2~"
+    dpkg --compare-versions "$oldver" le "$last_bad_ver" || return 0
+    dpkg-divert --package cloud-init --remove --rename --divert \
+        /etc/init/ureadahead.conf.disabled /etc/init/ureadahead.conf
+}
 
 if [ "$1" = "configure" ]; then
-   # disable ureadahead (LP: #499520)
-   dpkg-divert --package cloud-init --rename --divert \
-      /etc/init/ureadahead.conf.disabled --add /etc/init/ureadahead.conf
    if db_get cloud-init/datasources; then
       values="$RET"
       if [ "${values#*MaaS}" != "${values}" ]; then
@@ -321,6 +324,8 @@ EOF
    disable_network_config_on_upgrade "$2"
 
    fix_azure_upgrade_1611074 "$2"
+
+   cleanup_ureadahead "$2"
 fi
 
 #DEBHELPER#
diff --git a/debian/cloud-init.postrm b/debian/cloud-init.postrm
index 81b6681..4e20db1 100644
--- a/debian/cloud-init.postrm
+++ b/debian/cloud-init.postrm
@@ -8,8 +8,6 @@ case "$1" in
       rm -f /etc/apt/apt.conf.d/90cloud-init-pipelining
       ;;
    remove)
-      dpkg-divert --package cloud-init --remove --rename --divert \
-            /etc/init/ureadahead.conf.disabled /etc/init/ureadahead.conf
       rm -f /etc/cloud/cloud.cfg.d/90cloud-init-pipelining
       ;;
 esac
diff --git a/debian/rules b/debian/rules
index f335b7f..ea815e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-INIT_SYSTEM ?= upstart,systemd
+INIT_SYSTEM ?= systemd
 export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM)
 
 %: