From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 31 Mar 2011 02:26:40 +0000 (+0200)
Subject: plymouth: use PID file to detect whether ply is running
X-Git-Tag: v22~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9408a2d295a312a5472345090e28e0502570494b;p=thirdparty%2Fsystemd.git

plymouth: use PID file to detect whether ply is running
---

diff --git a/TODO b/TODO
index 215a73601c1..803c6a8ecdd 100644
--- a/TODO
+++ b/TODO
@@ -33,6 +33,10 @@ F15:
 
 * selinux issue http://people.gnome.org/~cosimoc/selinux.jpg
 
+* do not print errors when random seed is not around
+
+* fix alsa mixer restore to not print error when no config is stored
+
 Features:
 
 * Find a way to replace /var/run, /var/lock directories with
diff --git a/src/util.c b/src/util.c
index 5e101e44178..a44fea09cfd 100644
--- a/src/util.c
+++ b/src/util.c
@@ -4189,7 +4189,7 @@ bool nulstr_contains(const char*nulstr, const char *needle) {
 }
 
 bool plymouth_running(void) {
-        return access("/run/initramfs/plymouth", F_OK) >= 0;
+        return access("/run/plymouth/pid", F_OK) >= 0;
 }
 
 static const char *const ioprio_class_table[] = {
diff --git a/units/plymouth-start.service b/units/plymouth-start.service
index 6ab51f32af2..10d03c6c62d 100644
--- a/units/plymouth-start.service
+++ b/units/plymouth-start.service
@@ -13,9 +13,9 @@ After=systemd-vconsole-setup.service udev-settle.service
 Before=systemd-ask-password-plymouth.service
 
 # Dracut informs us with this flag file if plymouth is already running
-ConditionPathExists=!/run/initramfs/plymouth
+ConditionPathExists=!/run/plymouth/pid
 
 [Service]
-ExecStart=/sbin/plymouthd --mode=boot
+ExecStart=/sbin/plymouthd --mode=boot --pid-file=/run/plymouth/pid
 ExecStartPost=-/bin/plymouth --show-splash
 Type=forking