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
/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