summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-04-30 04:23:36 +0200
committerLennart Poettering <lennart@poettering.net>2011-04-30 04:23:36 +0200
commit24a73f51574c000b536ef89d7596ff3e5ec8e115 (patch)
treed2c3b0c357bb25e0530f208f273cf6562412c0df
parentutil: don't AND cx with cx (diff)
downloadsystemd-24a73f51574c000b536ef89d7596ff3e5ec8e115.tar.gz
systemd-24a73f51574c000b536ef89d7596ff3e5ec8e115.tar.bz2
systemd-24a73f51574c000b536ef89d7596ff3e5ec8e115.zip
plymouth: introduce plymouth.enable=0 kernel command line switch
-rw-r--r--TODO4
-rw-r--r--units/plymouth-halt.service1
-rw-r--r--units/plymouth-kexec.service1
-rw-r--r--units/plymouth-poweroff.service1
-rw-r--r--units/plymouth-reboot.service1
-rw-r--r--units/plymouth-start.service1
6 files changed, 6 insertions, 3 deletions
diff --git a/TODO b/TODO
index 8d03d950c..1537e2797 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 962d829ff..2e194b360 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 0d7450fee..919c3f129 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 d4979df1e..8fcff3bab 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 7304a5fba..fb65bcc83 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 10d03c6c6..f618257a9 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