Joshua Harlow has proposed merging ~harlowja/cloud-init:local-before-nm into cloud-init:master.
Requested reviews: cloud init development team (cloud-init-dev) For more details, see: https://code.launchpad.net/~harlowja/cloud-init/+git/cloud-init/+merge/306283 -- Your team cloud init development team is requested to review the proposed merge of ~harlowja/cloud-init:local-before-nm into cloud-init:master.
diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service index bc2db60..4f8dd67 100644 --- a/systemd/cloud-init-local.service +++ b/systemd/cloud-init-local.service @@ -7,7 +7,11 @@ After=local-fs.target Before=basic.target Before=network-pre.target Before=shutdown.target +<<<<<<< systemd/cloud-init-local.service Conflicts=shutdown.target +======= +Before=NetworkManager.service +>>>>>>> systemd/cloud-init-local.service [Service] Type=oneshot
_______________________________________________ Mailing list: https://launchpad.net/~cloud-init-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
