rpms/cloud-init
8
1
Fork 1
Code Issues Pull Requests Releases Activity

Fix systemd dependency cycle with cloud-final and os-collect-config

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=1420946
https://bugzilla.redhat.com/show_bug.cgi?id=1428492
This commit is contained in:
Garrett Holmstrom 2017-03-14 14:15:13 -07:00
parent d8203eaece
commit 0ee6a1e21f
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cloud-init-0.7.9-systemd-cloud-final.patch Normal file
View File

@ -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]

10
cloud-init.spec
View File

@ -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