Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian....@packages.debian.org
Usertags: pu
Dear release team,
In Sid, I added missing systemd .service files to the cloud-init package,
because without them, the ordering when starting cloud-init is completely
wrong. With the default OpenStack image at cdimage.debian.org, you may
not find out about it, until you add some new daemons in the startup
process.
I wish to also update cloud-init in Jessie, to fix this issue, and
add the missing .service files. I have attached the debdiff between Debian
release -2 and -3.
1/ Would you agree with such a change?
2/ What should be the version number for this update? Should I use
0.7.6~bzr976-2+deb8u1 ? Or is 0.7.6~bzr976-3~deb8u1 more appropriate in
this case?
Please let me know,
Cheers,
Thomas Goirand (zigo)
diff -Nru cloud-init-0.7.6~bzr976/debian/changelog cloud-init-0.7.6~bzr976/debian/changelog
--- cloud-init-0.7.6~bzr976/debian/changelog 2014-07-05 11:29:08.000000000 +0000
+++ cloud-init-0.7.6~bzr976/debian/changelog 2015-06-08 10:04:04.000000000 +0000
@@ -1,3 +1,9 @@
+cloud-init (0.7.6~bzr976-3) unstable; urgency=medium
+
+ * Added upstream .service files (Closes: #784083).
+
+ -- Thomas Goirand <z...@debian.org> Mon, 08 Jun 2015 10:03:48 +0000
+
cloud-init (0.7.6~bzr976-2) unstable; urgency=medium
* Build-depend on iproute2 instead of iproute (Closes: #753695).
diff -Nru cloud-init-0.7.6~bzr976/debian/cloud-init.cloud-config.service cloud-init-0.7.6~bzr976/debian/cloud-init.cloud-config.service
--- cloud-init-0.7.6~bzr976/debian/cloud-init.cloud-config.service 1970-01-01 00:00:00.000000000 +0000
+++ cloud-init-0.7.6~bzr976/debian/cloud-init.cloud-config.service 2015-06-08 10:02:59.000000000 +0000
@@ -0,0 +1,17 @@
+[Unit]
+Description=Apply the settings specified in cloud-config
+After=network.target syslog.target cloud-config.target
+Requires=cloud-config.target
+Wants=network.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/cloud-init modules --mode=config
+RemainAfterExit=yes
+TimeoutSec=0
+
+# Output needs to appear in instance console output
+StandardOutput=journal+console
+
+[Install]
+WantedBy=multi-user.target
diff -Nru cloud-init-0.7.6~bzr976/debian/cloud-init.cloud-final.service cloud-init-0.7.6~bzr976/debian/cloud-init.cloud-final.service
--- cloud-init-0.7.6~bzr976/debian/cloud-init.cloud-final.service 1970-01-01 00:00:00.000000000 +0000
+++ cloud-init-0.7.6~bzr976/debian/cloud-init.cloud-final.service 2015-06-08 10:02:59.000000000 +0000
@@ -0,0 +1,17 @@
+[Unit]
+Description=Execute cloud user/final scripts
+After=network.target syslog.target cloud-config.service rc-local.service
+Requires=cloud-config.target
+Wants=network.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/cloud-init modules --mode=final
+RemainAfterExit=yes
+TimeoutSec=0
+
+# Output needs to appear in instance console output
+StandardOutput=journal+console
+
+[Install]
+WantedBy=multi-user.target
diff -Nru cloud-init-0.7.6~bzr976/debian/cloud-init.cloud-init-local.service cloud-init-0.7.6~bzr976/debian/cloud-init.cloud-init-local.service
--- cloud-init-0.7.6~bzr976/debian/cloud-init.cloud-init-local.service 1970-01-01 00:00:00.000000000 +0000
+++ cloud-init-0.7.6~bzr976/debian/cloud-init.cloud-init-local.service 2015-06-08 10:03:00.000000000 +0000
@@ -0,0 +1,16 @@
+[Unit]
+Description=Initial cloud-init job (pre-networking)
+Wants=local-fs.target
+After=local-fs.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/cloud-init init --local
+RemainAfterExit=yes
+TimeoutSec=0
+
+# Output needs to appear in instance console output
+StandardOutput=journal+console
+
+[Install]
+WantedBy=multi-user.target
diff -Nru cloud-init-0.7.6~bzr976/debian/cloud-init.service cloud-init-0.7.6~bzr976/debian/cloud-init.service
--- cloud-init-0.7.6~bzr976/debian/cloud-init.service 1970-01-01 00:00:00.000000000 +0000
+++ cloud-init-0.7.6~bzr976/debian/cloud-init.service 2015-06-08 10:03:00.000000000 +0000
@@ -0,0 +1,18 @@
+[Unit]
+Description=Initial cloud-init job (metadata service crawler)
+After=local-fs.target network.target cloud-init-local.service
+Before=sshd.service sshd-keygen.service
+Requires=network.target
+Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/cloud-init init
+RemainAfterExit=yes
+TimeoutSec=0
+
+# Output needs to appear in instance console output
+StandardOutput=journal+console
+
+[Install]
+WantedBy=multi-user.target
diff -Nru cloud-init-0.7.6~bzr976/debian/control cloud-init-0.7.6~bzr976/debian/control
--- cloud-init-0.7.6~bzr976/debian/control 2014-07-05 11:14:31.000000000 +0000
+++ cloud-init-0.7.6~bzr976/debian/control 2015-06-08 12:40:18.000000000 +0000
@@ -6,6 +6,7 @@
Section: admin
Priority: optional
Build-Depends: debhelper (>= 9),
+ dh-systemd,
iproute2,
po-debconf,
pyflakes,
diff -Nru cloud-init-0.7.6~bzr976/debian/rules cloud-init-0.7.6~bzr976/debian/rules
--- cloud-init-0.7.6~bzr976/debian/rules 2014-04-12 07:13:31.000000000 +0000
+++ cloud-init-0.7.6~bzr976/debian/rules 2015-06-08 12:40:30.000000000 +0000
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@ --with python2 --buildsystem=python_distutils
+ dh $@ --with python2,systemd --buildsystem=python_distutils
override_dh_install:
dh_install
