util: split out plymouth related stuff

diff --git a/src/basic/def.h b/src/basic/def.h
index 929da726ae5b8b9672a9ee5cf4f61df71ec60213..48344f7a8e1cae3be9896a2e98d1988d05a49d28 100644 (file)
--- 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 30466ce9464cd1a9f32ba781891c33ae57ca93f7..c666ab941f49ccdbfe2dc0a778ec71da77629aad 100644 (file)
--- 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 (file)
index 0000000..2023ec3
--- /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 (file)
index 0000000..e053991
--- /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 ce3e321925d4b1fd2a0f34e1a5951395d1d57634..ed91cabde55f12471f711073fd5f928da773915b 100644 (file)
--- 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 02fc31e69e380bea2eb5028add1485a7e697a6f8..f6f005a29bcc7dac3f81b4e488c6e1c16e6f4bff 100644 (file)
--- 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 e60ee32b0608729fbafd306ada962d73eb8a2a45..eecf48dea53bfa4e74050acee3ff82330dea3243 100644 (file)
--- 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 d974d4451d7b6f9234171923740b4fc5aec7b2a7..2d3418dda13a4f46c1662ec0124181b1ca9d44fb 100644 (file)
--- 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"