daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
aed857
From f7507f4bb5385ed0303451d812d220f14f341629 Mon Sep 17 00:00:00 2001
aed857
From: Lennart Poettering <lennart@poettering.net>
aed857
Date: Thu, 28 Jan 2016 18:48:42 +0100
aed857
Subject: [PATCH] core: make sure "systemctl reload-or-try-restart is actually
aed857
 a noop if a unit is not running
aed857
aed857
This makes sure we follow the same basic logic for try-restart if we have a try-reload.
aed857
aed857
Fixes #688
aed857
aed857
(cherry picked from commit 3282591dc30b2934a895c7403d2f0b0690260947)
aed857
Resolves: #1191920
aed857
---
aed857
 src/core/dbus-unit.c | 2 +-
aed857
 src/core/job.c       | 8 ++++++++
aed857
 src/core/job.h       | 3 +++
aed857
 src/core/unit.c      | 2 ++
aed857
 4 files changed, 14 insertions(+), 1 deletion(-)
aed857
aed857
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
aed857
index 1d0d6f67c..f0f75e01b 100644
aed857
--- a/src/core/dbus-unit.c
aed857
+++ b/src/core/dbus-unit.c
aed857
@@ -850,7 +850,7 @@ int bus_unit_queue_job(
aed857
                 if (type == JOB_RESTART)
aed857
                         type = JOB_RELOAD_OR_START;
aed857
                 else if (type == JOB_TRY_RESTART)
aed857
-                        type = JOB_RELOAD;
aed857
+                        type = JOB_TRY_RELOAD;
aed857
         }
aed857
 
aed857
         r = mac_selinux_unit_access_check(
aed857
diff --git a/src/core/job.c b/src/core/job.c
aed857
index 1617e24c0..c9a43a4cb 100644
aed857
--- a/src/core/job.c
aed857
+++ b/src/core/job.c
aed857
@@ -404,6 +404,13 @@ JobType job_type_collapse(JobType t, Unit *u) {
aed857
 
aed857
                 return JOB_RESTART;
aed857
 
aed857
+        case JOB_TRY_RELOAD:
aed857
+                s = unit_active_state(u);
aed857
+                if (UNIT_IS_INACTIVE_OR_DEACTIVATING(s))
aed857
+                        return JOB_NOP;
aed857
+
aed857
+                return JOB_RELOAD;
aed857
+
aed857
         case JOB_RELOAD_OR_START:
aed857
                 s = unit_active_state(u);
aed857
                 if (UNIT_IS_INACTIVE_OR_DEACTIVATING(s))
aed857
@@ -1212,6 +1219,7 @@ static const char* const job_type_table[_JOB_TYPE_MAX] = {
aed857
         [JOB_RELOAD_OR_START] = "reload-or-start",
aed857
         [JOB_RESTART] = "restart",
aed857
         [JOB_TRY_RESTART] = "try-restart",
aed857
+        [JOB_TRY_RELOAD] = "try-reload",
aed857
         [JOB_NOP] = "nop",
aed857
 };
aed857
 
aed857
diff --git a/src/core/job.h b/src/core/job.h
aed857
index ce81607de..535052b48 100644
aed857
--- a/src/core/job.h
aed857
+++ b/src/core/job.h
aed857
@@ -63,6 +63,9 @@ enum JobType {
aed857
          * Thus we never need to merge it with anything. */
aed857
         JOB_TRY_RESTART = _JOB_TYPE_MAX_IN_TRANSACTION, /* if running, stop and then start */
aed857
 
aed857
+        /* Similar to JOB_TRY_RESTART but collapses to JOB_RELOAD or JOB_NOP */
aed857
+        JOB_TRY_RELOAD,
aed857
+
aed857
         /* JOB_RELOAD_OR_START won't enter into a transaction and cannot result
aed857
          * from transaction merging (there's no way for JOB_RELOAD and
aed857
          * JOB_START to meet in one transaction). It can result from a merge
aed857
diff --git a/src/core/unit.c b/src/core/unit.c
aed857
index 41d7b63d7..6d535ae12 100644
aed857
--- a/src/core/unit.c
aed857
+++ b/src/core/unit.c
aed857
@@ -1868,6 +1868,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
aed857
 
aed857
                 case JOB_RELOAD:
aed857
                 case JOB_RELOAD_OR_START:
aed857
+                case JOB_TRY_RELOAD:
aed857
 
aed857
                         if (u->job->state == JOB_RUNNING) {
aed857
                                 if (ns == UNIT_ACTIVE)
aed857
@@ -2144,6 +2145,7 @@ bool unit_job_is_applicable(Unit *u, JobType j) {
aed857
                 return unit_can_start(u);
aed857
 
aed857
         case JOB_RELOAD:
aed857
+        case JOB_TRY_RELOAD:
aed857
                 return unit_can_reload(u);
aed857
 
aed857
         case JOB_RELOAD_OR_START: