Order cloud-init-local before NetworkManager
https://git.launchpad.net/cloud-init/commit/?id=1b71b47
This commit is contained in:
parent
1bd98b8ce6
commit
6565dcf95d
12
cloud-init-0.7.8-before-nm.patch
Normal file
12
cloud-init-0.7.8-before-nm.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
Index: cloud-init-0.7.8/systemd/cloud-init-local.service
|
||||||
|
===================================================================
|
||||||
|
--- cloud-init-0.7.8.orig/systemd/cloud-init-local.service
|
||||||
|
+++ cloud-init-0.7.8/systemd/cloud-init-local.service
|
||||||
|
@@ -5,6 +5,7 @@ Wants=local-fs.target
|
||||||
|
Wants=network-pre.target
|
||||||
|
After=local-fs.target
|
||||||
|
Conflicts=shutdown.target
|
||||||
|
+Before=NetworkManager.target
|
||||||
|
Before=network-pre.target
|
||||||
|
Before=shutdown.target
|
||||||
|
|
@ -36,6 +36,10 @@ Patch7: cloud-init-0.7.8-dnf.patch
|
|||||||
# https://bugs.launchpad.net/cloud-init/+bug/1629149
|
# https://bugs.launchpad.net/cloud-init/+bug/1629149
|
||||||
Patch8: cloud-init-0.7.8-apt-dns-test.patch
|
Patch8: cloud-init-0.7.8-apt-dns-test.patch
|
||||||
|
|
||||||
|
# Ensure cloud-init-local runs before NetworkManager
|
||||||
|
# https://git.launchpad.net/cloud-init/commit/?id=1b71b47
|
||||||
|
Patch9: cloud-init-0.7.8-before-nm.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
@ -178,6 +182,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
* Thu Sep 29 2016 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.8-1
|
* Thu Sep 29 2016 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.8-1
|
||||||
- Updated to 0.7.8
|
- Updated to 0.7.8
|
||||||
- Dropped run-parts dependency [RH:1355917]
|
- Dropped run-parts dependency [RH:1355917]
|
||||||
|
- Ordered cloud-init-local before NetworkManager
|
||||||
|
|
||||||
* Tue Aug 30 2016 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.7-1
|
* Tue Aug 30 2016 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.7-1
|
||||||
- Updated to 0.7.7
|
- Updated to 0.7.7
|
||||||
|
Loading…
Reference in New Issue
Block a user