← Back to team overview

cloud-init-dev team mailing list archive

[Merge] lp:~jordane/cloud-init/sshd-systemd-fix into lp:cloud-init

 

Jordan Evans has proposed merging lp:~jordane/cloud-init/sshd-systemd-fix into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1333920 in cloud-init: "sshd can start before cloud-init injects keys"
  https://bugs.launchpad.net/cloud-init/+bug/1333920

For more details, see:
https://code.launchpad.net/~jordane/cloud-init/sshd-systemd-fix/+merge/224353

Fixes bug 1333920, a race condition between sshd and cloud-init by making cloud-init start before sshd.
-- 
https://code.launchpad.net/~jordane/cloud-init/sshd-systemd-fix/+merge/224353
Your team cloud init development team is requested to review the proposed merge of lp:~jordane/cloud-init/sshd-systemd-fix into lp:cloud-init.
=== modified file 'systemd/cloud-init.service'
--- systemd/cloud-init.service	2013-09-20 23:04:49 +0000
+++ systemd/cloud-init.service	2014-06-24 19:37:28 +0000
@@ -1,8 +1,9 @@
 [Unit]
 Description=Initial cloud-init job (metadata service crawler)
 After=local-fs.target network.target cloud-init-local.service
+Before=sshd.service
 Requires=network.target
-Wants=local-fs.target cloud-init-local.service
+Wants=local-fs.target cloud-init-local.service sshd.service
 
 [Service]
 Type=oneshot


Follow ups