SVN: xinitrc-ng/trunk/xinitdefs

baggins baggins at pld-linux.org
Thu Jul 28 14:41:32 CEST 2011


Author: baggins
Date: Thu Jul 28 14:41:32 2011
New Revision: 12292

Modified:
   xinitrc-ng/trunk/xinitdefs
Log:
- no xprofile (no users)
- no xkbsymbols (no provider, dead code)
- create error log file in $HOM first


Modified: xinitrc-ng/trunk/xinitdefs
==============================================================================
--- xinitrc-ng/trunk/xinitdefs	(original)
+++ xinitrc-ng/trunk/xinitdefs	Thu Jul 28 14:41:32 2011
@@ -4,19 +4,19 @@
 
 [ -f /etc/profile ] && . /etc/profile
 [ -f $HOME/.profile ] && . $HOME/.profile
-# Anybody use this?
-[ -f /etc/xprofile ] && . /etc/xprofile
-[ -f $HOME/.xprofile ] && . $HOME/.xprofile
 
 # Redirect errors to a file in user's home directory if possible
-errfn=xerr-$USER-$DISPLAY
-for errfile in "${TMPDIR-/tmp}/$errfn" "/tmp/$errfn" "$HOME/.$errfn"; do
-	if cp /dev/null "$errfile" 2> /dev/null ; then
-		chmod 600 "$errfile"
-		exec > "$errfile" 2>&1
-		break
-	fi
-done
+# GDM redirect output itself in a smarter fashion
+if [ -z "$GDMSESSION" ]; then
+	errfn=$(mktemp -q xerr-$USER-$DISPLAY.XXXXX)
+	for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/$errfn" "/tmp/$errfn"; do
+		if cp /dev/null "$errfile" 2> /dev/null ; then
+			chmod 600 "$errfile"
+			exec > "$errfile" 2>&1
+			break
+		fi
+	done
+fi
 
 # System wide settings
 sysxkbmap=/etc/X11/xinit/Xkbmap
@@ -61,16 +61,6 @@
 	XKB_IN_USE=yes
 fi
 
-if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
-	if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
-		xkbsymbols=`sed -n -e 's/^[ 	]*XkbSymbols[ 	]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
-		if [ -n "$xkbsymbols" ]; then
-			setxkbmap -symbols "$xkbsymbols"
-			XKB_IN_USE=yes
-		fi
-	fi
-fi
-
 # xkb and xmodmap don't play nice together
 if [ -z "$XKB_IN_USE" ]; then
 	if [ -f $sysmodmap ]; then


More information about the pld-cvs-commit mailing list