X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fconfigure-xorg;h=1aed47f5f271957405d8ac24c466c62ce2530137;hb=5b9748f009f9348a5f023d9ad6cb980fd56b5ff8;hp=8bef873a0eb9922762cf728f74bb16b8279952f7;hpb=e1ab6ff650a6ac8d5f532f8e066998a966926be8;p=hvlinux.git

diff --git a/stage4/configure-xorg b/stage4/configure-xorg
index 8bef873..1aed47f 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
@@ -40,8 +42,15 @@ cat > /etc/skel/.xsession << "EOF"
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
-sysresources=/usr/lib/X11/xinit/.Xresources
-sysmodmap=/usr/lib/X11/xinit/.Xmodmap
+sysresources=/usr/lib/xorg/xdm/Xresources
+sysmodmap=/etc/X11/Xmodmap
+
+if [ -r /etc/profile ]; then
+    . /etc/profile
+fi
+if [ -r ~/.bash_profile ]; then
+    . ~/.bash_profile
+fi
 
 # merge in defaults and keymaps
 
@@ -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.
@@ -103,18 +111,6 @@ cat >> /etc/sysconfig/createfiles << "EOF"
 /tmp/.ICE-unix dir 1777 root root
 EOF
 
-# Packages in Xorg store their configuration files in /usr/lib/X11
-# by default. This is strictly against FHS guidelines. Correct the
-# installation /etc/X11 and create symlinks in the original location:
-mkdir -v -p /etc/X11
-
-for file in /usr/{lib/X11/{xinit,xdm},share/X11/app-defaults}; do
-    if [ -f ${file} -a ! -h ${file} ]; then
-        mv -v ${file} /etc/X11/ 2> /dev/null
-        ln -svfT /etc/X11/$(basename $file) $file
-    fi
-done
-
 if [ "x${INST_TYPE}" = "xltsp-server" ]; then
     # Enable remote xdm login for LTSP clients
     sed -i -e "s@^\(DisplayManager.requestPort.*\)@!\1@g" /etc/X11/xdm/xdm-config