Browse Source

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

master
Harald Hoyer 13 years ago
parent
commit
c9a81c1f91
  1. 4
      modules.d/50plymouth/module-setup.sh
  2. 2
      modules.d/50plymouth/plymouth-newroot.sh
  3. 2
      modules.d/50plymouth/plymouth-pretrigger.sh

4
modules.d/50plymouth/module-setup.sh

@ -76,9 +76,5 @@ install() {
inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh
inst_hook emergency 50 "$moddir"/plymouth-emergency.sh inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
dracut_install readlink dracut_install readlink

if [[ -x $systemdutildir/systemd ]]; then
dracut_install -o $systemdsystemunitdir/plymouth-quit-wait.service
fi
} }



2
modules.d/50plymouth/plymouth-newroot.sh

@ -2,6 +2,6 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh # 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 /bin/plymouth --newroot=$NEWROOT
fi fi

2
modules.d/50plymouth/plymouth-pretrigger.sh

@ -2,7 +2,7 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh # 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 if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
# first trigger graphics subsystem # first trigger graphics subsystem
udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1 udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1

Loading…
Cancel
Save