Merge ~harlowja/cloud-init:local-before-nm into cloud-init:master

Proposed by Joshua Harlow
Status: Merged
Approved by: Scott Moser
Approved revision: 9b647ee16a2c629b2d8f4c9dbffa4076b5507510
Merged at revision: 1b71b474c0fc06e67aab8676268fd83d99091910
Proposed branch: ~harlowja/cloud-init:local-before-nm
Merge into: cloud-init:master
Diff against target: 12 lines (+1/-0)
1 file modified
systemd/cloud-init-local.service (+1/-0)
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email: mp+306283@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service
2index bc2db60..f41f8bf 100644
3--- a/systemd/cloud-init-local.service
4+++ b/systemd/cloud-init-local.service
5@@ -8,6 +8,7 @@ Before=basic.target
6 Before=network-pre.target
7 Before=shutdown.target
8 Conflicts=shutdown.target
9+Before=NetworkManager.service
10
11 [Service]
12 Type=oneshot

Subscribers

People subscribed via source and target branches