From 3297e1b240ab8e608d0fbb26636d80077384f937 Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Sat, 10 Sep 2011 15:58:47 +0000
Subject: [PATCH] -Changed .Xdefaults to .Xresources -Fixed incorrect
 environment when running xdm by sourcing /etc/profile in .xsession. -Fixed
 "Cannot open display..." when running X applications with su.

---
 stage4/configure-xorg | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/stage4/configure-xorg b/stage4/configure-xorg
index 8bef873..a47d6d9 100755
--- a/stage4/configure-xorg
+++ b/stage4/configure-xorg
@@ -9,11 +9,13 @@ cat > /etc/skel/.xinitrc << "EOF"
 dbus-launch --exit-with-session wmaker
 EOF
 
-cat > /etc/skel/.Xdefaults << "EOF"
+X_RESOURCES_FILE="Xresources"
+
+cat > /etc/skel/.${X_RESOURCES_FILE} << "EOF"
 xterm*scrollBar: false
 xterm*rightScrollBar: false
 xterm*saveLines: 1000
-xterm*geometry: 120x45+70+50
+xterm*geometry: 160x60+70+50
 xterm*background: #000000
 xterm*foreground: #A8A8A8
 xterm*color0:  #000000
@@ -43,6 +45,13 @@ usermodmap=$HOME/.Xmodmap
 sysresources=/usr/lib/X11/xinit/.Xresources
 sysmodmap=/usr/lib/X11/xinit/.Xmodmap
 
+if [ -r /etc/profile ]; then
+    . /etc/profile
+fi
+if [ -r ~/.bash_profile ]; then
+    . ~/.bash_profile
+fi
+
 # merge in defaults and keymaps
 
 if [ -f $sysresources ]; then
@@ -61,8 +70,10 @@ if [ -f "$usermodmap" ]; then
     xmodmap "$usermodmap"
 fi
 
-# now, we see if xdm/gdm/kdm has asked for a specific environment
+# To fix bug "Cannot open display..." when running commands as su root:
+xhost +localhost
 
+# now, we see if xdm/gdm/kdm has asked for a specific environment
 case $# in
     1)
 	case $1 in
@@ -90,9 +101,6 @@ EOF
 
 chmod 755 /etc/skel/.xsession
 
-cp /etc/skel/.{xinitrc,Xdefaults,xsession} /root
-cp /etc/skel/.{xinitrc,Xdefaults,xsession} /home/${REGUSER}
-
 # When needed, the X Window System creates the directory /tmp/.ICE-unix if it
 # does not exist. If this directory is not owned by root, the X Window System
 # delays startup by a few seconds and also appends a warning to the logfile.
-- 
2.20.1