File 0001-core-coldplug-possible-nop_job.patch of Package systemd.14146

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-core-coldplug-possible-nop_job.patch of Package systemd.14146 (Revision a9a2a69642a4fc9700184fd75cec1ded)

Currently displaying revision a9a2a69642a4fc9700184fd75cec1ded , Show latest

From 1a8f476dc4e17cf4c2ec34aa73966812c6a23f61 Mon Sep 17 00:00:00 2001
From: ypf791 <ypf791@gmail.com>
Date: Fri, 19 Jul 2019 18:28:04 +0800
Subject: [PATCH] core: coldplug possible nop_job

(cherry picked from commit b49e14d5f3081dfcd363d8199a14c0924ae9152f)

[fbui: fixes bsc#1139459]
---
 src/core/unit.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/unit.c b/src/core/unit.c
index febce9d242..b2fd4075b3 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3184,6 +3184,7 @@ int unit_add_node_link(Unit *u, const char *what, bool wants, UnitDependency dep
 int unit_coldplug(Unit *u) {
         int r = 0, q;
         char **i;
+        Job *uj;
 
         assert(u);
 
@@ -3207,8 +3208,9 @@ int unit_coldplug(Unit *u) {
                         r = q;
         }
 
-        if (u->job) {
-                q = job_coldplug(u->job);
+        uj = u->job ?: u->nop_job;
+        if (uj) {
+                q = job_coldplug(uj);
                 if (q < 0 && r >= 0)
                         r = q;
         }
-- 
2.21.0

Places

File 0001-core-coldplug-possible-nop_job.patch of Package systemd.14146 (Revision a9a2a69642a4fc9700184fd75cec1ded)

Places