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 <Saul.Wold@intel.com>

diff --git a/meta/recipes-core/sysvinit/sysvinit/rc b/meta/recipes-core/sysvinit/sysvinit/rc
index dce31a5c98799bfb0e9d64ab3dfedd4e97bfc8a3..44bc9bfd7468b4bd689a115f21794bb288f67ee5 100755 (executable)
--- 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