From a3b152f85c2ba6214c7d5dfbdc897f0a2e545762 Mon Sep 17 00:00:00 2001
From: Angelo Arrifano <miknix@gentoo.org>
Date: Sun, 7 Jun 2009 17:00:54 +0000
Subject: [gpe-base/gpe-dm] Cleanup gpe-dm scripts.

---
 gpe-base/gpe-dm/files/Xinit   | 22 +++++++++-------------
 gpe-base/gpe-dm/files/Xserver |  9 +++++----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/gpe-base/gpe-dm/files/Xinit b/gpe-base/gpe-dm/files/Xinit
index 5b8c969..6e18e02 100644
--- a/gpe-base/gpe-dm/files/Xinit
+++ b/gpe-base/gpe-dm/files/Xinit
@@ -1,16 +1,12 @@
 #!/bin/sh
-# Copied from gpe xserver-common
+# /etc/X11/gpe-dm/Xinit: Launch stuff after the Xserver is up.
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Angelo Arrifano <miknix@gentoo.org>
+# $Header: $
+# Modified from gpe xserver-common
 
-export USER=root
-export HOME=/home/root
-if [ ! -d $HOME ] && [ -d /root ]; then
-  HOME=/root
-fi
-export XAPPLRESDIR=/usr/X11R6/lib/app-defaults
-export XFILESEARCHPATH=./%N%S%C.ad:/usr/X11R6/lib/X11/%L/%T/%N%S%C:/usr/X11R6/lib/X11/%l/%T/%N%S%C:/usr/X11R6/lib/X11/%T/%N%S%C:./%N%S.ad:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S:/usr/local/lib/X11/app-defaults/%N%S%C.ad
+# Please, make sure profile.env sets a proper PATH before filling a bug.
+. /etc/profile.env
 
-export PATH=$PATH:/usr/X11R6/bin
-
-SYSSESSIONDIR=/etc/X11/gpe-dm/Xinit.d
-
-exec run-parts $SYSSESSIONDIR
+exec run-parts /etc/X11/gpe-dm/Xinit.d
diff --git a/gpe-base/gpe-dm/files/Xserver b/gpe-base/gpe-dm/files/Xserver
index cd9f060..9be190c 100644
--- a/gpe-base/gpe-dm/files/Xserver
+++ b/gpe-base/gpe-dm/files/Xserver
@@ -34,8 +34,9 @@ FB_DEVICE=""
 EXTRA_ARGS="-br -pn"
 
 # Choose the Xserver to start.
-# Rule of the thumb: Xfbdev for embedded and Xorg for desktops.
-# exec Xfbdev ${SCREEN_GEOMETRY} ${SCREEN_DPI} ${FB_DEVICE} ${INPUT_DEVICES} ${EXTRA_ARGS}
-# exec Xorg :0 -audit 0 -nolisten tcp vt7
-exec Xorg :0 -audit 0 -nolisten tcp vt7
+# Rule of the thumb: Xfbdev for embedded, Xorg for desktops.
+# exec /usr/bin/Xfbdev ${SCREEN_GEOMETRY} ${SCREEN_DPI} ${FB_DEVICE} ${INPUT_DEVICES} ${EXTRA_ARGS}
+# exec /usr/bin/Xorg :0 -audit 0 -nolisten tcp vt7
+# exec /usr/bin/Xnest :5
+exec /usr/bin/Xorg :0 -audit 0 -nolisten tcp vt7
 
-- 
cgit v1.2.3-65-gdbad