diff options
| author |   Angelo Arrifano <miknix@gentoo.org> | 2009-07-04 01:34:28 +0000 |
|---|---|---|
| committer | Angelo Arrifano <miknix@gentoo.org> | 2009-07-04 01:34:28 +0000 |
| commit | 75644f117999e275b8973f8c97e8e96836069b6a (patch) | |
| tree | 77e1e83ef39056887352947a481db70123139b58 /gpe-base/gpe-dm | |
| parent | Convert and cleanup scripts for gentoo. (diff) | |
| download | gentoo-2-75644f117999e275b8973f8c97e8e96836069b6a.tar.gz gentoo-2-75644f117999e275b8973f8c97e8e96836069b6a.tar.bz2 gentoo-2-75644f117999e275b8973f8c97e8e96836069b6a.zip | |
Cleanup and gentooize Xinit.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'gpe-base/gpe-dm')
| -rw-r--r-- | gpe-base/gpe-dm/ChangeLog | 6 | ||||
| -rw-r--r-- | gpe-base/gpe-dm/files/Xinit | 22 | ||||
| -rw-r--r-- | gpe-base/gpe-dm/files/Xserver | 10 |
3 files changed, 19 insertions, 19 deletions
diff --git a/gpe-base/gpe-dm/ChangeLog b/gpe-base/gpe-dm/ChangeLog index eae737250f00..998e5ce23528 100644 --- a/gpe-base/gpe-dm/ChangeLog +++ b/gpe-base/gpe-dm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gpe-base/gpe-dm # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gpe-base/gpe-dm/ChangeLog,v 1.1 2009/05/30 15:19:41 miknix Exp $ +# $Header: /var/cvsroot/gentoo-x86/gpe-base/gpe-dm/ChangeLog,v 1.2 2009/07/04 01:34:28 miknix Exp $ + + 04 Jul 2009; Angelo Arrifano <miknix@gentoo.org> files/Xinit, + files/Xserver: + Cleanup and gentooize Xinit. *gpe-dm-0.51-r1 (30 May 2009) diff --git a/gpe-base/gpe-dm/files/Xinit b/gpe-base/gpe-dm/files/Xinit index 5b8c9692145b..77416fb6a005 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: /var/cvsroot/gentoo-x86/gpe-base/gpe-dm/files/Xinit,v 1.2 2009/07/04 01:34:27 miknix Exp $ +# 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 sets a proper PATH before filling a bug. +. /etc/profile -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 cd9f060ab7d5..da62d58f1dd5 100644 --- a/gpe-base/gpe-dm/files/Xserver +++ b/gpe-base/gpe-dm/files/Xserver @@ -3,7 +3,7 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Angelo Arrifano <miknix@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/gpe-base/gpe-dm/files/Xserver,v 1.1 2009/05/30 15:19:41 miknix Exp $ +# $Header: /var/cvsroot/gentoo-x86/gpe-base/gpe-dm/files/Xserver,v 1.2 2009/07/04 01:34:27 miknix Exp $ ############################################################################ # NOTE: If you are using Xorg, you should edit /etc/X11/xorg.conf instead. # @@ -34,8 +34,8 @@ 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/Xorg :0 -audit 0 -nolisten tcp vt7 |