cloud-init-dev team mailing list archive

[Scott Moser <smoser@xxxxxxxxxx>]

Scott Moser has proposed merging ~smoser/cloud-init:bug/1636912-systemd-cleanup into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1629797 in cloud-init: "resolve service in nsswitch.conf adds 25 seconds to failed lookups before systemd-resolved is up"
  https://bugs.launchpad.net/cloud-init/+bug/1629797
  Bug #1636912 in systemd (Ubuntu): "systemd-networkd runs too late for cloud-init.service (net)"
  https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1636912

For more details, see:
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/310547
-- 
Your team cloud init development team is requested to review the proposed merge of ~smoser/cloud-init:bug/1636912-systemd-cleanup into cloud-init:master.

diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service
index 55834ba..17e1391 100644
--- a/systemd/cloud-init-local.service
+++ b/systemd/cloud-init-local.service
@@ -1,9 +1,7 @@
 [Unit]
 Description=Initial cloud-init job (pre-networking)
 DefaultDependencies=no
-Wants=local-fs.target
 Wants=network-pre.target
-After=local-fs.target
 Before=basic.target
 Before=NetworkManager.service
 Before=network-pre.target
diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service
index 5c71b21..85e447d 100644
--- a/systemd/cloud-init.service
+++ b/systemd/cloud-init.service
@@ -7,12 +7,11 @@ Wants=sshd-keygen.service
 Wants=sshd.service
 After=cloud-init-local.service
 After=networking.service
-Requires=networking.service
-Before=basic.target
-Before=dbus.socket
+After=systemd-networkd-wait-online.service
 Before=network-online.target
 Before=sshd-keygen.service
 Before=sshd.service
+Before=sysinit.target
 Before=systemd-user-sessions.service
 Conflicts=shutdown.target