From e56f9ffe514a626636d92ffa0ddba7a6f5781568 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 14 Mar 2019 11:35:42 +0100
Subject: [PATCH] util: split out plymouth related stuff

---
 src/basic/def.h                                     |  5 -----
 src/basic/meson.build                               |  2 ++
 src/basic/plymouth-util.c                           |  9 +++++++++
 src/basic/plymouth-util.h                           | 11 +++++++++++
 src/basic/util.c                                    |  4 ----
 src/basic/util.h                                    |  2 --
 src/core/manager.c                                  |  1 +
 src/tty-ask-password-agent/tty-ask-password-agent.c |  1 +
 8 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 src/basic/plymouth-util.c
 create mode 100644 src/basic/plymouth-util.h

diff --git a/src/basic/def.h b/src/basic/def.h
index 929da726ae..48344f7a8e 100644
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -39,11 +39,6 @@
 #define DEFAULT_SYSTEM_BUS_ADDRESS "unix:path=/run/dbus/system_bus_socket"
 #define DEFAULT_USER_BUS_ADDRESS_FMT "unix:path=%s/bus"
 
-#define PLYMOUTH_SOCKET {                                       \
-                .un.sun_family = AF_UNIX,                       \
-                .un.sun_path = "\0/org/freedesktop/plymouthd",  \
-        }
-
 #define NOTIFY_FD_MAX 768
 #define NOTIFY_BUFFER_MAX PIPE_BUF
 
diff --git a/src/basic/meson.build b/src/basic/meson.build
index 30466ce946..c666ab941f 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -140,6 +140,8 @@ basic_sources = files('''
         parse-util.h
         path-util.c
         path-util.h
+        plymouth-util.c
+        plymouth-util.h
         prioq.c
         prioq.h
         proc-cmdline.c
diff --git a/src/basic/plymouth-util.c b/src/basic/plymouth-util.c
new file mode 100644
index 0000000000..2023ec3671
--- /dev/null
+++ b/src/basic/plymouth-util.c
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#include <unistd.h>
+
+#include "plymouth-util.h"
+
+bool plymouth_running(void) {
+        return access("/run/plymouth/pid", F_OK) >= 0;
+}
diff --git a/src/basic/plymouth-util.h b/src/basic/plymouth-util.h
new file mode 100644
index 0000000000..e0539910c4
--- /dev/null
+++ b/src/basic/plymouth-util.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+#pragma once
+
+#include <stdbool.h>
+
+#define PLYMOUTH_SOCKET {                                       \
+                .un.sun_family = AF_UNIX,                       \
+                .un.sun_path = "\0/org/freedesktop/plymouthd",  \
+        }
+
+bool plymouth_running(void);
diff --git a/src/basic/util.c b/src/basic/util.c
index ce3e321925..ed91cabde5 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -51,10 +51,6 @@ int saved_argc = 0;
 char **saved_argv = NULL;
 static int saved_in_initrd = -1;
 
-bool plymouth_running(void) {
-        return access("/run/plymouth/pid", F_OK) >= 0;
-}
-
 bool display_is_local(const char *display) {
         assert(display);
 
diff --git a/src/basic/util.h b/src/basic/util.h
index 02fc31e69e..f6f005a29b 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -43,8 +43,6 @@ static inline const char* enable_disable(bool b) {
         return b ? "enable" : "disable";
 }
 
-bool plymouth_running(void);
-
 bool display_is_local(const char *display) _pure_;
 
 #define NULSTR_FOREACH(i, l)                                    \
diff --git a/src/core/manager.c b/src/core/manager.c
index e60ee32b06..eecf48dea5 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -58,6 +58,7 @@
 #include "parse-util.h"
 #include "path-lookup.h"
 #include "path-util.h"
+#include "plymouth-util.h"
 #include "process-util.h"
 #include "ratelimit.h"
 #include "rlimit-util.h"
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index d974d4451d..2d3418dda1 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -34,6 +34,7 @@
 #include "memory-util.h"
 #include "mkdir.h"
 #include "path-util.h"
+#include "plymouth-util.h"
 #include "pretty-print.h"
 #include "process-util.h"
 #include "signal-util.h"