Fix systemd dependency cycle with cloud-init and multi-user.target

https://bugzilla.redhat.com/show_bug.cgi?id=1428492
https://bugzilla.redhat.com/show_bug.cgi?id=1430511
This commit is contained in:
Garrett Holmstrom 2017-03-14 14:28:26 -07:00
parent 0ee6a1e21f
commit 27b10acec6
2 changed files with 15 additions and 1 deletions

View File

@ -9,3 +9,13 @@ Index: cloud-init-0.7.9/systemd/cloud-init.service
Wants=cloud-init-local.service
Wants=sshd-keygen.service
Wants=sshd.service
@@ -9,9 +8,7 @@ After=networking.service
Before=network-online.target
Before=sshd-keygen.service
Before=sshd.service
-Before=sysinit.target
Before=systemd-user-sessions.service
-Conflicts=shutdown.target
[Service]
Type=oneshot

View File

@ -39,7 +39,10 @@ Patch12: cloud-init-0.7.9-disable-lxd-tests.patch
# Fix calls to hostnamectl occurring before dbus is up
# https://bugzilla.redhat.com/show_bug.cgi?id=1417025
Patch13: cloud-init-0.7.9-defaultdeps.patch
# Fix systemd dependency cycle with cloud-init and multi-user.target
# https://bugzilla.redhat.com/show_bug.cgi?id=1428492
# https://bugzilla.redhat.com/show_bug.cgi?id=1430511
Patch13: cloud-init-0.7.9-systemd-cloud-init.patch
# Fix systemd dependency cycle with cloud-final and os-collect-config
# https://bugzilla.redhat.com/show_bug.cgi?id=1420946
@ -184,6 +187,7 @@ 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]
- Fixed systemd dependency cycle with cloud-init and multi-user.target [RH:1428492, RH:1430511]
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild