From: Franck Bui <fbui@suse.com>
Date: Thu, 11 Jun 2020 09:56:11 +0000 (+0200)
Subject: pid1: introduce an helper to handle the show-status marker
X-Git-Tag: v246-rc1~130^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ceb347130e6a3cb1df46e621e2bee8e925577f4;p=thirdparty%2Fsystemd.git

pid1: introduce an helper to handle the show-status marker

No functional change.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index ecca2f71978..d64fa6fd21b 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -4284,6 +4284,13 @@ bool manager_get_show_status_on(Manager *m) {
         return show_status_on(manager_get_show_status(m));
 }
 
+static void set_show_status_marker(bool b) {
+        if (b)
+                (void) touch("/run/systemd/show-status");
+        else
+                (void) unlink("/run/systemd/show-status");
+}
+
 void manager_set_show_status(Manager *m, ShowStatus mode, const char *reason) {
         assert(m);
         assert(reason);
@@ -4304,10 +4311,7 @@ void manager_set_show_status(Manager *m, ShowStatus mode, const char *reason) {
                           strna(show_status_to_string(mode)),
                           reason);
 
-                if (enabled)
-                        (void) touch("/run/systemd/show-status");
-                else
-                        (void) unlink("/run/systemd/show-status");
+                set_show_status_marker(enabled);
         }
 
         m->show_status = mode;
@@ -4333,11 +4337,7 @@ void manager_set_show_status_overridden(Manager *m, ShowStatus mode, const char
                   strna(show_status_to_string(mode)),
                   reason);
 
-        if (show_status_on(mode))
-                (void) touch("/run/systemd/show-status");
-        else
-                (void) unlink("/run/systemd/show-status");
-
+        set_show_status_marker(show_status_on(mode));
 }
 
 const char *manager_get_confirm_spawn(Manager *m) {