From deba7adc4b936891e1d43c981ed3c8935df16498 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 14 Oct 2010 09:48:21 -0700 Subject: sysvinit: add check for no X11 to disbale psplash Add a check to the rc script to check if the /etc/init.d/xserver-nodm script exists and is executable and not disable psplash if it is, otherwise disable pspalsh since we do not have X installed. Fixed [BUG #457] Signed-off-by: Saul Wold --- meta/recipes-core/sysvinit/sysvinit/rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-core/sysvinit/sysvinit') diff --git a/meta/recipes-core/sysvinit/sysvinit/rc b/meta/recipes-core/sysvinit/sysvinit/rc index dce31a5c98..44bc9bfd74 100755 --- a/meta/recipes-core/sysvinit/sysvinit/rc +++ b/meta/recipes-core/sysvinit/sysvinit/rc @@ -171,9 +171,9 @@ startup() { fi #Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch -#if [ "x$runlevel" != "xS" ]; then -# if type psplash-write >/dev/null 2>&1; then -# TMPDIR=/mnt/.psplash psplash-write "QUIT" || true -# umount /mnt/.psplash -# fi -#fi +if [ "x$runlevel" != "xS" ] && [ ! -x /etc/init.d/xserver-nodm ]; then + if type psplash-write >/dev/null 2>&1; then + TMPDIR=/mnt/.psplash psplash-write "QUIT" || true + umount /mnt/.psplash + fi +fi -- cgit 1.2.3-korg