rpm/cloud-init
SHA256
1
0
Fork 0
forked from pool/cloud-init
Code Pull Requests Activity

- Add cloud-init-break-cycle-local-service.patch

Browse Source 
+ Let systemd pull in the default targets. This breaks a cycle

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=97
This commit is contained in:
Robert Schweikert 2017-11-19 20:45:04 +00:00 committed by Git OBS Bridge
parent 7a8b456518
commit 100e3dffbf
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cloud-init-break-cycle-local-service.patch Normal file
View File

@ -0,0 +1,15 @@
--- systemd/cloud-init-local.service.tmpl.orig
+++ systemd/cloud-init-local.service.tmpl
@@ -13,12 +13,6 @@ Before=shutdown.target
Before=sysinit.target
Conflicts=shutdown.target
{% endif %}
-{% if variant in ["suse"] %}
-# Other distros use Before=sysinit.target. There is not a clearly identified
-# reason for usage of basic.target instead.
-Before=basic.target
-Conflicts=shutdown.target
-{% endif %}
RequiresMountsFor=/var/lib/cloud
[Service]

6
cloud-init.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Nov 19 20:43:46 UTC 2017 - rjschwei@suse.com
- Add cloud-init-break-cycle-local-service.patch
+ Let systemd pull in the default targets. This breaks a cycle
-------------------------------------------------------------------
Fri Nov 17 17:10:09 UTC 2017 - rjschwei@suse.com

6
cloud-init.spec
View File

@ -33,8 +33,11 @@ Patch5: zypp_add_repo_test.patch
Patch6: cloud-init-hosts-template.patch
# FIXME cloud-init-ntp-conf-suse.patch proposed for upstream merge (lp#1726572)
Patch7: cloud-init-ntp-conf-suse.patch
# Patch 8 cloud-init-translate-netconf-ipv4-keep-gw (bsc#1064854)
# FIXME cloud-init-translate-netconf-ipv4-keep-gw (bsc#1064854)
# proposed for upstream merge (lp#1732966)
Patch8: cloud-init-translate-netconf-ipv4-keep-gw.patch
# FIXME cloud-init-break-cycle-local-service.patch
Patch9: cloud-init-break-cycle-local-service.patch
Patch10: cloud-init-no-user-lock-if-already-locked.patch
Patch12: fix-default-systemd-unit-dir.patch
# Remove Patch 13 for next source updated, included upstream
@ -199,6 +202,7 @@ Documentation and examples for cloud-init tools
%patch6
%patch7
%patch8
%patch9
%patch10 -p1
%patch12
%patch13