diff options
| author | Scott Moser <smoser@brickies.net> | 2016-11-15 17:24:33 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-11-15 17:24:33 -0500 |
| commit | 05da1f862da3062260db62de45acac5afebca382 (patch) | |
| tree | 347f77f2ec2293eace3f86c3338b28cfda80912d | |
| parent | 0ad13665aa7bedc0b8cf5d78eff76993812b5199 (diff) | |
| parent | b6561a134936ba48eaccc447c3fe2526f0b84bb9 (diff) | |
| download | vyos-cloud-init-05da1f862da3062260db62de45acac5afebca382.tar.gz vyos-cloud-init-05da1f862da3062260db62de45acac5afebca382.zip | |
merge from b6561a134936ba48eaccc447c3fe2526f0b84bb9 at 0.7.8-47-gb6561a1
| -rw-r--r-- | systemd/cloud-init-local.service | 2 | ||||
| -rw-r--r-- | systemd/cloud-init.service | 1 |
2 files changed, 1 insertions, 2 deletions
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 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 |