From f1f04247f4cfd952f8c9be18848078426bb642c1 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sat, 27 Jul 2013 23:39:40 +0200 Subject: [PATCH] linuxrc: move splash initialization to splash_init() --- defaults/initrd.scripts | 8 ++++++++ defaults/linuxrc | 7 +------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 834eff9..03158d1 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -109,6 +109,14 @@ plymouth_newroot() { is_plymouth_started && "${PLYMOUTH_BIN}" --newroot="${1}" } +splash_init() { + if is_udev; then + # if udev, we can load the splash earlier + # In the plymouth case, udev will load KMS automatically + splashcmd init + fi +} + call_func_timeout() { local func=$1 timeout=$2 pid watcher [ $# -ne 2 ] && gen_die "call_func_timeout() called with $# arguments" diff --git a/defaults/linuxrc b/defaults/linuxrc index a60c329..323a743 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -289,12 +289,7 @@ else bad_msg "Cannot find either udev or mdev" fi -if is_udev -then - # if udev, we can load the splash earlier - # In the plymouth case, udev will load KMS automatically - splashcmd init -fi +splash_init # Load modules listed in MY_HWOPTS if /lib/modules exists for the running kernel if [ -z "${DO_modules}" ]