diff options
| author | Scott Moser <smoser@brickies.net> | 2016-11-15 12:06:58 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-11-15 12:06:58 -0500 |
| commit | eb29af61f9388de7a69bf7112193976dd4feb6db (patch) | |
| tree | 0a12d1de1bc6bb5527a3f99d01401df95250c0c7 /systemd | |
| parent | 4613bb45dde05cc859a0b4dec6587d80767b47c7 (diff) | |
| parent | 584b8434872322a9f617831742cc6b15977ecfbc (diff) | |
| download | vyos-cloud-init-eb29af61f9388de7a69bf7112193976dd4feb6db.tar.gz vyos-cloud-init-eb29af61f9388de7a69bf7112193976dd4feb6db.zip | |
merge from master at 0.7.8-45-g584b843
Diffstat (limited to 'systemd')
| -rw-r--r-- | systemd/cloud-init-local.service | 4 | ||||
| -rw-r--r-- | systemd/cloud-init.service | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service index 55834ba4..9b3e88fa 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 5c71b213..cde6ed84 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 |