diff options
| author | Saul Wold <Saul.Wold@intel.com> | 2010-10-14 09:48:21 -0700 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-14 20:12:03 +0100 |
| commit | deba7adc4b936891e1d43c981ed3c8935df16498 (patch) | |
| tree | 8d3dee6355d3d919f45416574f7e20053e54d3bf | |
| parent | cb34a1496a7ff946452c236d764bd67320f8b710 (diff) | |
| download | openembedded-core-deba7adc4b936891e1d43c981ed3c8935df16498.tar.gz openembedded-core-deba7adc4b936891e1d43c981ed3c8935df16498.tar.bz2 openembedded-core-deba7adc4b936891e1d43c981ed3c8935df16498.tar.xz openembedded-core-deba7adc4b936891e1d43c981ed3c8935df16498.zip | |
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>
| -rwxr-xr-x | meta/recipes-core/sysvinit/sysvinit/rc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit/rc b/meta/recipes-core/sysvinit/sysvinit/rc index dce31a5c9..44bc9bfd7 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 |