diff options
| author | Scott Moser <smoser@brickies.net> | 2016-11-10 10:49:17 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-11-10 17:09:29 -0500 |
| commit | bf4010a9c379e2109b030af558033014f9137f47 (patch) | |
| tree | cc737a0e243f5787151b9599e5f8769b7797e3da | |
| parent | f7d6bfadf4c84e702e950851e8001ee8f4e3c4b4 (diff) | |
| download | vyos-cloud-init-bf4010a9c379e2109b030af558033014f9137f47.tar.gz vyos-cloud-init-bf4010a9c379e2109b030af558033014f9137f47.zip | |
systemd: drop both Wants and After local-fs.target
Drop mention of local-fs.target from both cloud-init-local.service
and cloud-init.service. This could actually could cause a loop in
ordering due to cc_mounts writing mount points with:
x-systemd.requires=cloud-init.service
Rather, we specifically list /var/lib/ and systemd-remount-fs.service
in cloud-init-local.service. cloud-init.service will run after
cloud-init-local and thus will have these satisfied.
| -rw-r--r-- | systemd/cloud-init-local.service | 4 | ||||
| -rw-r--r-- | systemd/cloud-init.service | 1 |
2 files changed, 2 insertions, 3 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 85e447d2..cde6ed84 100644 --- a/systemd/cloud-init.service +++ b/systemd/cloud-init.service @@ -2,7 +2,6 @@ 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 |