plymouth: do not start plymouth via dracut for systemd in the initramfs

diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh
index 14d9e59ad9b88bcca259d425c920fcb7715a7392..10aa0da4422928859c43bd642290923efcacc68b 100755 (executable)
--- a/modules.d/50plymouth/module-setup.sh
+++ b/modules.d/50plymouth/module-setup.sh
@@ -76,9 +76,5 @@ install() {
     inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh
     inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
     dracut_install readlink
-
-    if [[ -x $systemdutildir/systemd ]]; then
-        dracut_install -o $systemdsystemunitdir/plymouth-quit-wait.service
-    fi
 }
 

diff --git a/modules.d/50plymouth/plymouth-newroot.sh b/modules.d/50plymouth/plymouth-newroot.sh
index e03e98d03a2afb2d4587f6de71f83ee0db925256..ffbabf1b548bf962081416b9cfb91a2c1be6cd89 100755 (executable)
--- a/modules.d/50plymouth/plymouth-newroot.sh
+++ b/modules.d/50plymouth/plymouth-newroot.sh
@@ -2,6 +2,6 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-if [ -x /bin/plymouth ]; then
+if [ -x /bin/plymouth ! -x /lib/systemd/systemd ]; then
     /bin/plymouth --newroot=$NEWROOT
 fi

diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
index ddb8ddba785335ba8155d69d9295996be341aa6f..c52cf83915dc361ff1d993e942a75cecca778216 100755 (executable)
--- a/modules.d/50plymouth/plymouth-pretrigger.sh
+++ b/modules.d/50plymouth/plymouth-pretrigger.sh
@@ -2,7 +2,7 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-if [ -x /bin/plymouthd ]; then
+if [ -x /bin/plymouthd -a ! -x /lib/systemd/systemd ]; then
     if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
         # first trigger graphics subsystem
         udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1