Merge ~smoser/cloud-init:bug/1636912-systemd-cleanup into cloud-init:master

[Scott Moser]

[Martin Pitt (pitti)]

LGTM, except for dropping local-fs.target; see inline comment.

review: Needs Information

[Ryan Harper (raharper)]

We should sync/link with a systemd but requiring systemd-networkd.service to drop After=dbus.service ... nto sure if https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1636912 covers that on the systemd side, without that, networkd/netplan enabled instances will break if they want to mount things early (like in Azure).

[Martin Pitt (pitti)]

LGTM now, thanks!

Yes, bug 163692 covers making networkd not wait for dbus.service. I'll get to that RSN.

review: Approve

[Scott Moser (smoser)]

Martin, i think you typoed the bug number above.

[Martin Pitt (pitti)]

I meant bug 1636912, the one Ryan already pointed to.

[Scott Moser (smoser)]

When re-reviewing this, I saw that cloud-init-local.service still has 'Before=basic.target'.
I'm wondering if Martin just missed that, or if that is ok.

see Martin's comment at https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1629797/comments/20 for why we made the change to cloud-init.service.

[Scott Moser (smoser)]

further reading and i realize that sysinit.target is before basic.target.

So, the 'Before=basic.target' in cloud-init-local.service is basically pointless as cloud-init.service has After=cloud-init.service and Before=sysinit.target.

[Scott Moser (smoser)]

I added https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/310919 to address that change.

diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service
index 55834ba..9b3e88f 100644
--- a/systemd/cloud-init-local.service
+++ b/systemd/cloud-init-local.service
@@ -1,14 +1,14 @@
 [Unit]
 Description=Initial cloud-init job (pre-networking)
 DefaultDependencies=no
-Wants=local-fs.target
 Wants=network-pre.target
-After=local-fs.target
+After=systemd-remount-fs.service
 Before=basic.target
 Before=NetworkManager.service
 Before=network-pre.target
 Before=shutdown.target
 Conflicts=shutdown.target
+RequiresMountsFor=/var/lib
 
 [Service]
 Type=oneshot
diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service
index 5c71b21..cde6ed8 100644
--- a/systemd/cloud-init.service
+++ b/systemd/cloud-init.service
@@ -2,17 +2,15 @@
 Description=Initial cloud-init job (metadata service crawler)
 DefaultDependencies=no
 Wants=cloud-init-local.service
-Wants=local-fs.target
 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