fix systemd unit dependency cycle
backported from the following upstream commit: https://git.launchpad.net/cloud-init/commit/?id=3705bb5964a2ff3f9a67265e6d090a112b35e40c fixes the following bz: https://bugzilla.redhat.com/show_bug.cgi?id=1393094
This commit is contained in:
parent
38d515ffe0
commit
5bfa86fab4
37
cloud-init-0.7.8-systemd-loop.target
Normal file
37
cloud-init-0.7.8-systemd-loop.target
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From 3705bb5964a2ff3f9a67265e6d090a112b35e40c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Scott Moser <smoser@brickies.net>
|
||||||
|
Date: Thu, 15 Sep 2016 09:30:50 -0400
|
||||||
|
Subject: [PATCH] systemd: put cloud-init.target After multi-user.target
|
||||||
|
|
||||||
|
When we moved cloud-final.service to run After multi-user.target it
|
||||||
|
caused a dependency loop (as cloud-init.target was still implied to be
|
||||||
|
Before multi-user.target).
|
||||||
|
|
||||||
|
journalctl would either show:
|
||||||
|
cloud-init.target: Breaking ordering cycle by deleting job
|
||||||
|
cloud-final.service/start
|
||||||
|
or
|
||||||
|
multi-user.target: Breaking ordering cycle by deleting job
|
||||||
|
cloud-init.target/start
|
||||||
|
|
||||||
|
The fix here is to clearly state that cloud-init.target is also
|
||||||
|
After multi-user.target
|
||||||
|
|
||||||
|
LP: #1623868
|
||||||
|
---
|
||||||
|
systemd/cloud-init.target | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/systemd/cloud-init.target b/systemd/cloud-init.target
|
||||||
|
index a63babb..d568458 100644
|
||||||
|
--- a/systemd/cloud-init.target
|
||||||
|
+++ b/systemd/cloud-init.target
|
||||||
|
@@ -4,3 +4,4 @@
|
||||||
|
# b.) touch a file /etc/cloud/cloud-init.disabled
|
||||||
|
[Unit]
|
||||||
|
Description=Cloud-init target
|
||||||
|
+After=multi-user.target
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
||||||
|
|
@ -54,6 +54,11 @@ Patch11: cloud-init-0.7.8-nm-controlled.patch
|
|||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1388568
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1388568
|
||||||
Patch12: cloud-init-0.7.8-enable-digitalocean.patch
|
Patch12: cloud-init-0.7.8-enable-digitalocean.patch
|
||||||
|
|
||||||
|
# Get rid of dependency loop in systemd units
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1393094
|
||||||
|
# https://git.launchpad.net/cloud-init/commit/?id=3705bb5964a2ff3f9a67265e6d090a112b35e40c
|
||||||
|
Patch14: cloud-init-0.7.8-systemd-loop.target
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
|
Loading…
Reference in New Issue
Block a user