diff options
| author | Scott Moser <smoser@brickies.net> | 2016-09-23 16:51:03 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-09-23 16:51:03 -0400 |
| commit | f13a89a1592d0445d93ea42809eba2363454488b (patch) | |
| tree | a254dd95a9f45ab55af92402e8c7789e28e2ae80 /systemd | |
| parent | 0e4eaef9640b6aaf09063124959717e05ed52b06 (diff) | |
| parent | 0439d8a17d181a2546f2f7cb2d71a04bbb13b186 (diff) | |
| download | vyos-cloud-init-f13a89a1592d0445d93ea42809eba2363454488b.tar.gz vyos-cloud-init-f13a89a1592d0445d93ea42809eba2363454488b.zip | |
merge from master at 0.7.8-8-g0439d8a
Diffstat (limited to 'systemd')
| -rw-r--r-- | systemd/cloud-init-local.service | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service index bc2db60e..55834ba4 100644 --- a/systemd/cloud-init-local.service +++ b/systemd/cloud-init-local.service @@ -5,6 +5,7 @@ Wants=local-fs.target Wants=network-pre.target After=local-fs.target Before=basic.target +Before=NetworkManager.service Before=network-pre.target Before=shutdown.target Conflicts=shutdown.target |