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:
ec195f5
)
plymouth: introduce plymouth.enable=0 kernel command line switch
author
Lennart Poettering
<lennart@poettering.net>
Sat, 30 Apr 2011 02:23:36 +0000
(
04:23
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Sat, 30 Apr 2011 02:23:36 +0000
(
04:23
+0200)
TODO
patch
|
blob
|
history
units/plymouth-halt.service
patch
|
blob
|
history
units/plymouth-kexec.service
patch
|
blob
|
history
units/plymouth-poweroff.service
patch
|
blob
|
history
units/plymouth-reboot.service
patch
|
blob
|
history
units/plymouth-start.service
patch
|
blob
|
history
diff --git
a/TODO
b/TODO
index 8d03d950c0643096c1481bae2b5b71c66f1361de..1537e2797d03d481a630172bb3c63f3c662d9b93 100644
(file)
--- a/
TODO
+++ b/
TODO
@@
-33,9
+33,7
@@
Features:
* drop /.readahead on bigger upgrades with yum
* 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)
* 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 962d829fff7964d996cdc72fc92cddf7881878c3..2e194b360e115775202838668f1d811d75a752d6 100644
(file)
--- 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
After=getty@tty1.service prefdm.service plymouth-start.service
Before=halt.service
DefaultDependencies=no
+ConditionKernelCommandLine=!plymouth.enable=0
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
diff --git
a/units/plymouth-kexec.service
b/units/plymouth-kexec.service
index 0d7450feea5798b926365d4b9301caf7696ca27d..919c3f12948180354e47e20383eb1aeadcae6dc7 100644
(file)
--- 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
After=getty@tty1.service prefdm.service plymouth-start.service
Before=kexec.service
DefaultDependencies=no
+ConditionKernelCommandLine=!plymouth.enable=0
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
diff --git
a/units/plymouth-poweroff.service
b/units/plymouth-poweroff.service
index d4979df1e077574facc9bf6205db2f256db8814c..8fcff3bab1474f55d1b56f397f597e2959132af3 100644
(file)
--- 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
After=getty@tty1.service prefdm.service plymouth-start.service
Before=poweroff.service
DefaultDependencies=no
+ConditionKernelCommandLine=!plymouth.enable=0
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
diff --git
a/units/plymouth-reboot.service
b/units/plymouth-reboot.service
index 7304a5fba2f9d2944a8aee43ef682ec433f90470..fb65bcc8365bd0fbfb1fdee385e7a5ada346d088 100644
(file)
--- 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
After=getty@tty1.service prefdm.service plymouth-start.service
Before=reboot.service
DefaultDependencies=no
+ConditionKernelCommandLine=!plymouth.enable=0
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
diff --git
a/units/plymouth-start.service
b/units/plymouth-start.service
index 10d03c6c62df5ce92956012f8ad5d1bb9ad4b6b1..f618257a937babb57bce4fa4f9d9e050aca38e79 100644
(file)
--- 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
# 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
[Service]
ExecStart=/sbin/plymouthd --mode=boot --pid-file=/run/plymouth/pid