diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-03-31 04:26:40 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-03-31 04:26:40 +0200 |
| commit | 9408a2d295a312a5472345090e28e0502570494b (patch) | |
| tree | fd660dddb7b41562342cca0832005b31911f84e7 | |
| parent | f695b3b09b672c327c5b525ed7a2390c4b99a67e (diff) | |
| download | systemd-9408a2d295a312a5472345090e28e0502570494b.tar.gz | |
plymouth: use PID file to detect whether ply is running
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | src/util.c | 2 | ||||
| -rw-r--r-- | units/plymouth-start.service | 4 |
3 files changed, 7 insertions, 3 deletions
@@ -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 5e101e4417..a44fea09cf 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 6ab51f32af..10d03c6c62 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 |