From 54343c41d65116c702c9e16ef434e93459bb1f31 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@dv9000.openelec.tv>
Date: Wed, 25 Mar 2009 19:42:47 +0100
Subject: [PATCH] fix starting xorg

---
 packages/sysutils/busybox/init.d/80_debug                 | 5 ++---
 packages/virtual/Xorg/init.d/65_xorg                      | 4 ++--
 packages/x11/app/xinit/scripts/xinitrc.d/20_windowmanager | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/sysutils/busybox/init.d/80_debug b/packages/sysutils/busybox/init.d/80_debug
index 0ac9b0c8c7..a577a252d9 100755
--- a/packages/sysutils/busybox/init.d/80_debug
+++ b/packages/sysutils/busybox/init.d/80_debug
@@ -6,7 +6,6 @@
 
 # start shell
 
-echo "#starting debug shell ###"
+echo "### starting debug shell ###"
 
-  exec /bin/sh </dev/tty2 >/dev/tty2 2>&1 &
-  exec /bin/sh
+  exec /bin/sh </dev/tty2 >/dev/tty2 2>&1
diff --git a/packages/virtual/Xorg/init.d/65_xorg b/packages/virtual/Xorg/init.d/65_xorg
index 5edfba1133..939b3acb68 100755
--- a/packages/virtual/Xorg/init.d/65_xorg
+++ b/packages/virtual/Xorg/init.d/65_xorg
@@ -13,7 +13,7 @@ mkdir -p /var/lib/xkb/
 
 if /usr/bin/test "${ELISA_DEBUG}" = "yes" ; then
   mount -o bind /storage /var/log
-  mount -o bind /storage /var/tmp
 fi
+#  mount -o bind /storage /var/tmp
 
-xinit $XINITRC -- $XSERVERRC &
\ No newline at end of file
+xinit $XINITRC -- $XSERVERRC
diff --git a/packages/x11/app/xinit/scripts/xinitrc.d/20_windowmanager b/packages/x11/app/xinit/scripts/xinitrc.d/20_windowmanager
index d5ab564cf7..054259d8d2 100644
--- a/packages/x11/app/xinit/scripts/xinitrc.d/20_windowmanager
+++ b/packages/x11/app/xinit/scripts/xinitrc.d/20_windowmanager
@@ -13,7 +13,7 @@ if test -f /usr/bin/mrxvt; then
 fi
 
 if /usr/bin/test "${OE_X_WM_ENABLED}" = "yes" ; then
-  /usr/bin/evilwm ${args}> /dev/null 2>&1 &
+  /usr/bin/evilwm -fn ${WM_FONT} ${args}> /dev/null 2>&1 &
 fi
 
 #    /usr/bin/evilwm -fn ${WM_FONT} ${args}> /dev/null 2>&1 &