From d0e293e4d4a2d6b41c5e6e2ee312bb1aae6031a9 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 15 Nov 2016 14:40:56 -0500 Subject: systemd: cloud-init-local change Before basic to sysinit sysinit.target happens earlier in boot than basic.target. cloud-init-local.service had: Before=basic.target but cloud-init.service had: After=cloud-init-local.service Before=sysinit.target The result was that cloud-init-local.service was indirectly Before sysinit.target anyway, so this change is just to more specifically state that. --- systemd/cloud-init-local.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service index 9b3e88fa..7d89419c 100644 --- a/systemd/cloud-init-local.service +++ b/systemd/cloud-init-local.service @@ -3,10 +3,10 @@ Description=Initial cloud-init job (pre-networking) DefaultDependencies=no Wants=network-pre.target After=systemd-remount-fs.service -Before=basic.target Before=NetworkManager.service Before=network-pre.target Before=shutdown.target +Before=sysinit.target Conflicts=shutdown.target RequiresMountsFor=/var/lib -- cgit v1.2.3 From b6561a134936ba48eaccc447c3fe2526f0b84bb9 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 15 Nov 2016 17:02:34 -0500 Subject: systemd: cloud-init remove After=systemd-networkd-wait-online cloud-init.service cannot currently run After=systemd-networkd-wait-online.service as systemd-networkd.service is After dbus.service, but cloud-init.service is: Before=sysinit.target and sysinit.target is before dbus.service. The result is that we are temporarily preferring for cases where there is systemd-networkd in place to have cloud-init.service run without networking properly configured. See bug 1636912 for more information. --- systemd/cloud-init.service | 1 - 1 file changed, 1 deletion(-) diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service index cde6ed84..fb3b918c 100644 --- a/systemd/cloud-init.service +++ b/systemd/cloud-init.service @@ -6,7 +6,6 @@ Wants=sshd-keygen.service Wants=sshd.service After=cloud-init-local.service After=networking.service -After=systemd-networkd-wait-online.service Before=network-online.target Before=sshd-keygen.service Before=sshd.service -- cgit v1.2.3