chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
031886e
)
shared - reinstate plymouth_running()
author
Tom Gundersen
<teg@jklm.no>
Mon, 16 Mar 2015 17:29:26 +0000
(18:29 +0100)
committer
Tom Gundersen
<teg@jklm.no>
Mon, 16 Mar 2015 17:30:20 +0000
(18:30 +0100)
This will be used by fsckd. This reverts part of
031886edfc6e96ab778c241035a8d00fb0de99d3
.
src/shared/util.c
patch
|
blob
|
history
src/shared/util.h
patch
|
blob
|
history
diff --git
a/src/shared/util.c
b/src/shared/util.c
index 3f3ca90f5d7e8b72e47ae96df6f18977049b2f0e..5cbbe8fb7d2886ffbbe36fab7cde07aba50fbe2c 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-4228,6
+4228,10
@@
bool nulstr_contains(const char*nulstr, const char *needle) {
return false;
}
+bool plymouth_running(void) {
+ return access("/run/plymouth/pid", F_OK) >= 0;
+}
+
char* strshorten(char *s, size_t l) {
assert(s);
diff --git
a/src/shared/util.h
b/src/shared/util.h
index 749bd0ea853c61f3c4a28b8d139c5de2ff48dea8..d229e1e68c95ac447462255fdf7907900f8b9482 100644
(file)
--- a/
src/shared/util.h
+++ b/
src/shared/util.h
@@
-549,6
+549,8
@@
int kill_and_sigcont(pid_t pid, int sig);
bool nulstr_contains(const char*nulstr, const char *needle);
+bool plymouth_running(void);
+
bool hostname_is_valid(const char *s) _pure_;
char* hostname_cleanup(char *s, bool lowercase);