kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Do not run plymouth hook if the binary is missing. 

There is a remove-boot-splash script in Mageia that can
strip plymouth from an initrd. Make this script a noop
if that has happened.
master
Colin Guthrie 13 years ago committed by Harald Hoyer
parent
04ab68a4dd
commit
9f630a1889
1 changed files with 23 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      modules.d/50plymouth/plymouth-pretrigger.sh

44
modules.d/50plymouth/plymouth-pretrigger.sh
Unescape View File

@ -2,27 +2,29 @@
# -*- 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 getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -n rd_NO_PLYMOUTH; then if [ -x /bin/plymouthd ]; then
[ -c /dev/null ] || mknod -m 0666 /dev/null c 1 3 if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -n rd_NO_PLYMOUTH; then
# first trigger graphics subsystem [ -c /dev/null ] || mknod -m 0666 /dev/null c 1 3
udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1 # first trigger graphics subsystem
# first trigger graphics and tty subsystem udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
udevadm trigger --action=add --subsystem-match=graphics --subsystem-match=drm --subsystem-match=tty >/dev/null 2>&1 # first trigger graphics and tty subsystem
udevadm trigger --action=add --subsystem-match=graphics --subsystem-match=drm --subsystem-match=tty >/dev/null 2>&1


udevadm settle --timeout=30 2>&1 | vinfo udevadm settle --timeout=30 2>&1 | vinfo
[ -c /dev/zero ] || mknod -m 0666 /dev/zero c 1 5 [ -c /dev/zero ] || mknod -m 0666 /dev/zero c 1 5
[ -c /dev/tty0 ] || mknod -m 0620 /dev/tty0 c 4 0 [ -c /dev/tty0 ] || mknod -m 0620 /dev/tty0 c 4 0
[ -e /dev/systty ] || ln -s tty0 /dev/systty [ -e /dev/systty ] || ln -s tty0 /dev/systty
[ -c /dev/fb0 ] || mknod -m 0660 /dev/fb0 c 29 0 [ -c /dev/fb0 ] || mknod -m 0660 /dev/fb0 c 29 0
[ -e /dev/fb ] || ln -s fb0 /dev/fb [ -e /dev/fb ] || ln -s fb0 /dev/fb


info "Starting plymouth daemon" info "Starting plymouth daemon"
mkdir -m 0755 /run/plymouth mkdir -m 0755 /run/plymouth
consoledev=$(getarg console= | sed -e 's/,.*//') consoledev=$(getarg console= | sed -e 's/,.*//')
consoledev=${consoledev:-tty0} consoledev=${consoledev:-tty0}
[ -x /lib/udev/console_init ] && /lib/udev/console_init "/dev/$consoledev" [ -x /lib/udev/console_init ] && /lib/udev/console_init "/dev/$consoledev"
[ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
/bin/plymouth --show-splash 2>&1 | vinfo /bin/plymouth --show-splash 2>&1 | vinfo
# reset tty after plymouth messed with it # reset tty after plymouth messed with it
[ -x /lib/udev/console_init ] && /lib/udev/console_init /dev/tty0 [ -x /lib/udev/console_init ] && /lib/udev/console_init /dev/tty0
fi
fi fi

Write Preview
Loading…
Cancel
Save