From 0ee6a1e21f4211a757520492933fa2e1da6021b9 Mon Sep 17 00:00:00 2001
From: Garrett Holmstrom <gholms@devzero.com>
Date: Tue, 14 Mar 2017 14:15:13 -0700
Subject: [PATCH] Fix systemd dependency cycle with cloud-final and
 os-collect-config

https://bugzilla.redhat.com/show_bug.cgi?id=1420946
https://bugzilla.redhat.com/show_bug.cgi?id=1428492
---
 cloud-init-0.7.9-systemd-cloud-final.patch | 12 ++++++++++++
 cloud-init.spec                            | 10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 cloud-init-0.7.9-systemd-cloud-final.patch

diff --git a/cloud-init-0.7.9-systemd-cloud-final.patch b/cloud-init-0.7.9-systemd-cloud-final.patch
new file mode 100644
index 0000000..190bb85
--- /dev/null
+++ b/cloud-init-0.7.9-systemd-cloud-final.patch
@@ -0,0 +1,12 @@
+Index: cloud-init-0.7.9/systemd/cloud-final.service
+===================================================================
+--- cloud-init-0.7.9.orig/systemd/cloud-final.service
++++ cloud-init-0.7.9/systemd/cloud-final.service
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=Execute cloud user/final scripts
+-After=network-online.target cloud-config.service rc-local.service multi-user.target
++After=network-online.target cloud-config.service rc-local.service
+ Wants=network-online.target cloud-config.service
+ 
+ [Service]
diff --git a/cloud-init.spec b/cloud-init.spec
index 2b9bb95..462db7b 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -1,6 +1,6 @@
 Name:           cloud-init
 Version:        0.7.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Cloud instance init scripts
 License:        GPLv3
 URL:            http://launchpad.net/cloud-init
@@ -41,6 +41,11 @@ Patch12:        cloud-init-0.7.9-disable-lxd-tests.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1417025
 Patch13:        cloud-init-0.7.9-defaultdeps.patch
 
+# Fix systemd dependency cycle with cloud-final and os-collect-config
+# https://bugzilla.redhat.com/show_bug.cgi?id=1420946
+# https://bugzilla.redhat.com/show_bug.cgi?id=1428492
+Patch14:        cloud-init-0.7.9-systemd-cloud-final.patch
+
 BuildArch:      noarch
 
 BuildRequires:  pkgconfig(systemd)
@@ -177,6 +182,9 @@ nosetests-%{python3_version} tests/unittests/ \
 
 
 %changelog
+* Tue Mar 14 2017 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.9-4
+- Fixed systemd dependency cycle with cloud-final and os-collect-config [RH:1420946, RH:1428492]
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild