From 24a73f51574c000b536ef89d7596ff3e5ec8e115 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 30 Apr 2011 04:23:36 +0200 Subject: [PATCH] plymouth: introduce plymouth.enable=0 kernel command line switch --- TODO | 4 +--- units/plymouth-halt.service | 1 + units/plymouth-kexec.service | 1 + units/plymouth-poweroff.service | 1 + units/plymouth-reboot.service | 1 + units/plymouth-start.service | 1 + 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/TODO b/TODO index 8d03d950c0..1537e2797d 100644 --- a/TODO +++ b/TODO @@ -33,9 +33,7 @@ Features: * drop /.readahead on bigger upgrades with yum -* add inode stat() check to readahead - -* plymouth.enable=0 +* add inode stat() check to readahead to suppress preloading changed files * include /usr/local/lib/tmpfiles.d in tmpfiles tool as search path (and prefix/lib, in case it isn't one of the listed ones) diff --git a/units/plymouth-halt.service b/units/plymouth-halt.service index 962d829fff..2e194b360e 100644 --- a/units/plymouth-halt.service +++ b/units/plymouth-halt.service @@ -10,6 +10,7 @@ Description=Show Plymouth Halt Screen After=getty@tty1.service prefdm.service plymouth-start.service Before=halt.service DefaultDependencies=no +ConditionKernelCommandLine=!plymouth.enable=0 [Service] ExecStart=/sbin/plymouthd --mode=shutdown diff --git a/units/plymouth-kexec.service b/units/plymouth-kexec.service index 0d7450feea..919c3f1294 100644 --- a/units/plymouth-kexec.service +++ b/units/plymouth-kexec.service @@ -10,6 +10,7 @@ Description=Show Plymouth Reboot with kexec Screen After=getty@tty1.service prefdm.service plymouth-start.service Before=kexec.service DefaultDependencies=no +ConditionKernelCommandLine=!plymouth.enable=0 [Service] ExecStart=/sbin/plymouthd --mode=shutdown diff --git a/units/plymouth-poweroff.service b/units/plymouth-poweroff.service index d4979df1e0..8fcff3bab1 100644 --- a/units/plymouth-poweroff.service +++ b/units/plymouth-poweroff.service @@ -10,6 +10,7 @@ Description=Show Plymouth Power Off Screen After=getty@tty1.service prefdm.service plymouth-start.service Before=poweroff.service DefaultDependencies=no +ConditionKernelCommandLine=!plymouth.enable=0 [Service] ExecStart=/sbin/plymouthd --mode=shutdown diff --git a/units/plymouth-reboot.service b/units/plymouth-reboot.service index 7304a5fba2..fb65bcc836 100644 --- a/units/plymouth-reboot.service +++ b/units/plymouth-reboot.service @@ -10,6 +10,7 @@ Description=Show Plymouth Reboot Screen After=getty@tty1.service prefdm.service plymouth-start.service Before=reboot.service DefaultDependencies=no +ConditionKernelCommandLine=!plymouth.enable=0 [Service] ExecStart=/sbin/plymouthd --mode=shutdown diff --git a/units/plymouth-start.service b/units/plymouth-start.service index 10d03c6c62..f618257a93 100644 --- a/units/plymouth-start.service +++ b/units/plymouth-start.service @@ -14,6 +14,7 @@ Before=systemd-ask-password-plymouth.service # Dracut informs us with this flag file if plymouth is already running ConditionPathExists=!/run/plymouth/pid +ConditionKernelCommandLine=!plymouth.enable=0 [Service] ExecStart=/sbin/plymouthd --mode=boot --pid-file=/run/plymouth/pid