diff -Naur xinitrc-2.4.23/install/etc/X11/prefdm xinitrc-2.4.24/install/etc/X11/prefdm
--- xinitrc-2.4.23/install/etc/X11/prefdm	2003-08-22 14:51:36 +0400
+++ xinitrc-2.4.24/install/etc/X11/prefdm	2005-11-25 20:04:09 +0300
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 HOME=/root
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin
 export HOME PATH
 
 # We need to source this so that the login screens get translated
diff -Naur xinitrc-2.4.23/install/etc/X11/xdm/GiveConsole xinitrc-2.4.24/install/etc/X11/xdm/GiveConsole
--- xinitrc-2.4.23/install/etc/X11/xdm/GiveConsole	2002-11-11 17:26:35 +0300
+++ xinitrc-2.4.24/install/etc/X11/xdm/GiveConsole	2005-11-25 20:04:09 +0300
@@ -8,5 +8,5 @@
 # causing serious grief.
 #
 chown $USER /dev/console
-/usr/X11R6/bin/sessreg  -a -w "/var/log/wtmp" -u "/var/run/utmp" \
+/usr/bin/sessreg  -a -w "/var/log/wtmp" -u "/var/run/utmp" \
 	-x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
diff -Naur xinitrc-2.4.23/install/etc/X11/xdm/TakeConsole xinitrc-2.4.24/install/etc/X11/xdm/TakeConsole
--- xinitrc-2.4.23/install/etc/X11/xdm/TakeConsole	2002-11-11 17:26:35 +0300
+++ xinitrc-2.4.24/install/etc/X11/xdm/TakeConsole	2005-11-25 20:04:09 +0300
@@ -5,5 +5,5 @@
 #
 chmod 622 /dev/console
 chown root /dev/console
-/usr/X11R6/bin/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \
+/usr/bin/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \
 	-x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
diff -Naur xinitrc-2.4.23/install/etc/X11/xdm/Xsetup_0 xinitrc-2.4.24/install/etc/X11/xdm/Xsetup_0
--- xinitrc-2.4.23/install/etc/X11/xdm/Xsetup_0	2002-11-11 17:26:35 +0300
+++ xinitrc-2.4.24/install/etc/X11/xdm/Xsetup_0	2005-11-25 20:04:09 +0300
@@ -13,10 +13,10 @@
 #      /usr/bin/kdmdesktop
 # Commented above line and added next line because of kdedesktop issues 
 # fixes background.
-      /usr/X11R6/bin/xsetroot -solid "#666699"
+      /usr/bin/xsetroot -solid "#666699"
 else
-      /usr/X11R6/bin/xsetroot -solid "#666699"
-      /usr/X11R6/bin/xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
+      /usr/bin/xsetroot -solid "#666699"
+      /usr/bin/xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
 fi
 
 ExecIfExecutable /etc/X11/xinit/fixkeyboard
diff -Naur xinitrc-2.4.23/install/etc/X11/xinit/fixkeyboard xinitrc-2.4.24/install/etc/X11/xinit/fixkeyboard
--- xinitrc-2.4.23/install/etc/X11/xinit/fixkeyboard	2003-10-14 15:47:48 +0400
+++ xinitrc-2.4.24/install/etc/X11/xinit/fixkeyboard	2005-11-27 11:43:02 +0300
@@ -9,31 +9,31 @@
 sysmodmap=/etc/X11/xinit/Xmodmap
 sysxkbmap=/etc/X11/xinit/Xkbmap
 # backward compatibility
-oldsysmodmap=/usr/X11R6/lib/X11/xinit/.Xmodmap
+oldsysmodmap=/usr/lib/X11/xinit/.Xmodmap
 
 # to be sure to have xdpyinfo and xmodmap
-PATH=/usr/X11R6/bin:$PATH
+PATH=/usr/bin:$PATH
 
 XKB_IN_USE=
 
-if xdpyinfo | grep XKEYBOARD > /dev/null 2>&1; then
+if /usr/bin/xdpyinfo | grep XKEYBOARD > /dev/null 2>&1; then
     XKB_IN_USE=yes
 fi
 
 # merge in keymaps
 #if [ -n "$XKB_IN_USE" -a -r $sysxkbmap ]; then
-#    setxkbmap `cat $sysxkbmap`
+#    /usr/bin/setxkbmap `cat $sysxkbmap`
 #fi
 
 if [ -n "$XKB_IN_USE" -a -r $userxkbmap ]; then
-    setxkbmap `cat $userxkbmap`
+    /usr/bin/setxkbmap `cat $userxkbmap`
 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'`
 	if [ -n "$xkbsymbols" ]; then
-	    setxkbmap -symbols "$xkbsymbols"
+	    /usr/bin/setxkbmap -symbols "$xkbsymbols"
 	    XKB_IN_USE=yes
 	fi
     fi
@@ -42,15 +42,15 @@
 # xkb and xmodmap don't play nice together
 if [ -z "$XKB_IN_USE" ]; then
     if [ -r $oldsysmodmap ]; then
-	xmodmap $oldsysmodmap
+	/usr/bin/xmodmap $oldsysmodmap
     fi
 
     if [ -r $sysmodmap ]; then
-	xmodmap $sysmodmap
+	/usr/bin/xmodmap $sysmodmap
     fi
 
     if [ -r $usermodmap ]; then
-	xmodmap $usermodmap
+	/usr/bin/xmodmap $usermodmap
     fi
 fi
 
diff -Naur xinitrc-2.4.23/install/etc/X11/xinit/xrootwarn xinitrc-2.4.24/install/etc/X11/xinit/xrootwarn
--- xinitrc-2.4.23/install/etc/X11/xinit/xrootwarn	2003-10-14 15:47:48 +0400
+++ xinitrc-2.4.24/install/etc/X11/xinit/xrootwarn	2005-11-25 20:04:09 +0300
@@ -14,7 +14,7 @@
 
 [ "$XROOTWARN" != no ] || exit 0
 
-/usr/X11R6/bin/xsetroot -solid "#FF8000"
+/usr/bin/xsetroot -solid "#FF8000"
 
 [ "$LANG" = POSIX -o "$LANGUAGE" = POSIX ] && SourceIfNotEmpty /etc/sysconfig/i18n ||:
 
diff -Naur xinitrc-2.4.23/install/etc/X11/xinit/xrootwarn.real xinitrc-2.4.24/install/etc/X11/xinit/xrootwarn.real
--- xinitrc-2.4.23/install/etc/X11/xinit/xrootwarn.real	2003-11-03 18:43:40 +0300
+++ xinitrc-2.4.24/install/etc/X11/xinit/xrootwarn.real	2005-11-25 20:04:09 +0300
@@ -15,4 +15,4 @@
 to the system.
 "
 
-exec /usr/X11R6/bin/xmessage -font fixed -center -buttons Continue:0,Exit:2 -default Exit "$message"
+exec /usr/bin/xmessage -font fixed -center -buttons Continue:0,Exit:2 -default Exit "$message"
diff -Naur xinitrc-2.4.23/install/etc/X11/xinit/xserverrc xinitrc-2.4.24/install/etc/X11/xinit/xserverrc
--- xinitrc-2.4.23/install/etc/X11/xinit/xserverrc	2003-10-14 15:47:21 +0400
+++ xinitrc-2.4.24/install/etc/X11/xinit/xserverrc	2005-11-25 20:04:09 +0300
@@ -1,5 +1,5 @@
 #!/bin/sh
 # $Id: xserverrc,v 1.1 2003/10/14 11:47:21 ldv Exp $
 
-usr_X11R6_bin_X=/usr/X11R6/bin/X
+usr_X11R6_bin_X=/usr/bin/X
 exec "$usr_X11R6_bin_X" -nolisten tcp "$@"
diff -Naur xinitrc-2.4.23/install/etc/X11/xinit.d/Mod_Meta_L_Disable xinitrc-2.4.24/install/etc/X11/xinit.d/Mod_Meta_L_Disable
--- xinitrc-2.4.23/install/etc/X11/xinit.d/Mod_Meta_L_Disable	2002-11-11 17:42:00 +0300
+++ xinitrc-2.4.24/install/etc/X11/xinit.d/Mod_Meta_L_Disable	2005-11-27 15:31:12 +0300
@@ -7,6 +7,6 @@
 
 if [ -f /etc/sysconfig/keyboard ];then
     if grep -q "REMOVE_MOD_META_L=yes" /etc/sysconfig/keyboard;then
-	xmodmap -e 'remove mod4 = Meta_L'
+	/usr/bin/xmodmap -e 'remove mod4 = Meta_L'
     fi
-fi
\ В конце файла нет новой строки
+fi
diff -Naur xinitrc-2.4.23/install/etc/X11/Xsession xinitrc-2.4.24/install/etc/X11/Xsession
--- xinitrc-2.4.23/install/etc/X11/Xsession	2005-09-30 03:00:38 +0400
+++ xinitrc-2.4.24/install/etc/X11/Xsession	2005-11-25 20:04:09 +0300
@@ -78,11 +78,11 @@
 
 if [ $# -ge 1 ]; then
 	# Clean up after xbanner.
-	RunIfExecutable /usr/X11R6/bin/freetemp
+	RunIfExecutable /usr/bin/freetemp
 else
 	# ALT default background and cursor.
-	/usr/X11R6/bin/xsetroot -solid "#666699"
-	/usr/X11R6/bin/xsetroot -cursor_name left_ptr
+	/usr/bin/xsetroot -solid "#666699"
+	/usr/bin/xsetroot -cursor_name left_ptr
 fi
 
 if [ -n "$LANGUAGE" ]; then
@@ -96,7 +96,7 @@
 Xrdb()
 {
 	if [ -s "$1" ]; then
-		/usr/X11R6/bin/xrdb -merge "$1"
+		/usr/bin/xrdb -merge "$1"
 		return 0
 	else
 		return 1
@@ -143,7 +143,7 @@
 	local n
 	for n in "$@"; do
 		if n=`absolute "$n"`; then
-			export BROWSER="/usr/X11R6/bin/xvt -e $n"
+			export BROWSER="/usr/bin/xvt -e $n"
 			break
 		fi
 	done
@@ -204,18 +204,18 @@
 
 # See if desktop manager has asked for a specific environment.
 if [ $# -ge 1 ]; then
-	exec /usr/X11R6/bin/runwm "$@"
+	exec /usr/bin/runwm "$@"
 else
 	# Try user defined action.
 	ExecIfExecutable "$HOME/.xsession"
 	ExecIfExecutable "$HOME/.Xclients"
 
 	# Try WM Selector.
-	ExecIfExecutable /usr/X11R6/bin/wm-select
+	ExecIfExecutable /usr/bin/wm-select
 
 	# Try WM Manager.
-	ExecIfExecutable /usr/X11R6/bin/wmselect
+	ExecIfExecutable /usr/bin/wmselect
 
 	# Try default from runwm.
-	exec /usr/X11R6/bin/runwm default
+	exec /usr/bin/runwm default
 fi
diff -Naur xinitrc-2.4.23/install/usr/bin/runwm xinitrc-2.4.24/install/usr/bin/runwm
--- xinitrc-2.4.23/install/usr/bin/runwm	1970-01-01 03:00:00 +0300
+++ xinitrc-2.4.24/install/usr/bin/runwm	2005-11-25 19:59:51 +0300
@@ -0,0 +1,145 @@
+#!/bin/sh -e
+#
+# $Id: runwm,v 1.5 2005/09/29 23:00:38 ldv Exp $
+# Copyright (C) 2002, 2005  Dmitry V. Levin <ldv@altlinux.org>
+#
+# Executes window manager using wm.d database.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+
+PROG="${0##*/}"
+WM_DIR=/etc/X11/wmsession.d
+
+Usage()
+{
+	[ "$1" = 0 ] || exec >&2
+	cat <<EOF
+Usage: $PROG <window manager> [args]
+       $PROG --print <window manager> [args]
+       $PROG --list
+       $PROG --help
+EOF
+	[ -n "$1" ] && exit "$1" || exit
+}
+
+[ "$1" != '--help' ] || Usage 0
+
+print_only=
+if [ "$1" = '--print' ]; then
+	print_only=1
+	shift
+fi
+
+if [ $# -lt 1 ]; then
+	Usage
+fi
+
+wm=`printf %s "$1" |tr '[:upper:]' '[:lower:]'`
+shift
+
+try_exec_wm()
+{
+	local f
+	for f in "$@"; do
+		if [ -x "$f" ]; then
+			exec "$f" ||:
+		fi
+	done
+}
+
+exec_wm()
+{
+	if [ -n "$print_only" ]; then
+		printf '%s\n' "$*"
+		exit
+	else
+		exec "$@"
+	fi
+}	
+
+is_safe_config()
+{
+	[ -f "$1" -a -r "$1" -a -s "$1" ] || return
+}
+
+found_default=
+scan_wm_dir()
+{
+	local wm="$1" && shift
+	local d
+
+	for d in "$WM_DIR/default" "$WM_DIR"/*; do
+		is_safe_config "$d" || continue
+
+		local n=${d##*/}
+
+		# skip files with names containing dot
+		[ -n "${n##*.*}" ] || continue
+
+		# if found default, skip file named "default"
+		[ -z "$found_default" -o "$n" != default ] || continue
+
+		# fetch pathname for later execution
+		local exec=`sed -ne 's,^EXEC=\(/.\+\)$,\1,pg' "$d" |tail -1`
+
+		if [ -x "$exec" ]; then
+			# fetch WM name
+			local name0=`sed -ne 's,^NAME=\(.\+\)$,\1,pg' "$d" |tail -1`
+			[ -n "$name0" ] || continue
+
+			# canonicalize WM name
+			local name=`printf %s "$name0" |tr '[:upper:]' '[:lower:]'`
+
+			# if in list mode, print and continue
+			if [ "$wm" = '--list' ]; then
+				printf '%s\n' "$name0"
+				[ "$name" != default ] || found_default=1
+				continue
+			fi
+
+			# if found WM, execute
+			if [ "$wm" = default -o "$wm" = "$name" ]; then
+				exec_wm "$exec" "$@"
+			fi
+		fi
+	done
+}
+
+if [ "$wm" = failsafe ]; then
+	if [ -n "$print_only" ]; then
+		echo "/usr/bin/xterm -geometry 100x25+0+0 $@"
+	else
+		/usr/bin/xterm -geometry 100x25+0+0 &
+		try_exec_wm /usr/bin/icewm-light /usr/bin/twm
+	fi
+	exit
+fi
+
+prefdm_config=/etc/sysconfig/desktop
+if [ "$wm" = default ] && is_safe_config "$prefdm_config"; then
+	prefdm="$(sed -ne 's/^[[:space:]]*\([^#[:space:]]\+\)[[:space:]]*$/\1/p' "$prefdm_config" |
+			head -1 |tr '[:upper:]' '[:lower:]')"
+	[ -z "$prefdm" ] || scan_wm_dir "$prefdm" "$@"
+fi
+
+scan_wm_dir "$wm" "$@"
+
+if [ "$wm" != '--list' ]; then
+	printf '%s: window manager "%s" not found.\n' "$PROG" "$wm" >&2
+	exit 1
+fi
+
+[ -n "$found_default" ] || echo default
diff -Naur xinitrc-2.4.23/install/usr/bin/xscreenlock xinitrc-2.4.24/install/usr/bin/xscreenlock
--- xinitrc-2.4.23/install/usr/bin/xscreenlock	1970-01-01 03:00:00 +0300
+++ xinitrc-2.4.24/install/usr/bin/xscreenlock	2005-11-25 20:00:18 +0300
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# $Id: xscreenlock,v 1.3 2005/09/29 23:00:38 ldv Exp $
+# Copyright (C) 2003, 2005  Dmitry V. Levin <ldv@altlinux.org>
+#
+# Wrapper for xscreensaver and xlockmore.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+
+unset n XSCREEN_CUSTOM XSCREEN_SERVER XSCREEN_CLIENT XSCREEN_SERVER_1 XSCREEN_CLIENT_1 XSCREEN_XLOCK ||:
+XSCREEN_CUSTOM="$HOME/.xscreenlock"
+XSCREEN_SERVER="/usr/bin/xscreensaver"
+XSCREEN_CLIENT="/usr/bin/xscreensaver-command"
+XSCREEN_SERVER_1="/usr/bin/xscreensaver"
+XSCREEN_CLIENT_1="/usr/bin/xscreensaver-command"
+XSCREEN_XLOCK="/usr/bin/xlock"
+
+if [ -x "$XSCREEN_CUSTOM" ]; then
+	exec "$XSCREEN_CUSTOM" "$@"
+fi
+
+if [ -x "$XSCREEN_SERVER_1" -a -x "$XSCREEN_CLIENT_1" ]; then
+	XSCREEN_SERVER="$XSCREEN_SERVER_1"
+	XSCREEN_CLIENT="$XSCREEN_CLIENT_1"
+fi
+
+if [ -x "$XSCREEN_SERVER" -a -x "$XSCREEN_CLIENT" ]; then
+	if ! "$XSCREEN_CLIENT" -version >/dev/null 2>&1; then
+		"$XSCREEN_SERVER" -nosplash </dev/null &
+		for n in `seq 1 5`; do
+			"$XSCREEN_CLIENT" -version >/dev/null 2>&1 && break
+			usleep 100000
+		done
+	fi
+	"$XSCREEN_CLIENT" -lock
+elif [ -x "$XSCREEN_XLOCK" ]; then
+	"$XSCREEN_XLOCK"
+fi
+
diff -Naur xinitrc-2.4.23/install/usr/sbin/update_wms xinitrc-2.4.24/install/usr/sbin/update_wms
--- xinitrc-2.4.23/install/usr/sbin/update_wms	2005-09-30 03:00:38 +0400
+++ xinitrc-2.4.24/install/usr/sbin/update_wms	2005-11-25 20:00:40 +0300
@@ -19,7 +19,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-runwmlist="$(/usr/X11R6/bin/runwm --list)" || exit 1
+runwmlist="$(/usr/bin/runwm --list)" || exit 1
 [ -n "$runwmlist" ] || exit 1
 
 # KDM
diff -Naur xinitrc-2.4.23/install/usr/X11R6/bin/runwm xinitrc-2.4.24/install/usr/X11R6/bin/runwm
--- xinitrc-2.4.23/install/usr/X11R6/bin/runwm	2005-09-30 03:00:38 +0400
+++ xinitrc-2.4.24/install/usr/X11R6/bin/runwm	1970-01-01 03:00:00 +0300
@@ -1,145 +0,0 @@
-#!/bin/sh -e
-#
-# $Id: runwm,v 1.5 2005/09/29 23:00:38 ldv Exp $
-# Copyright (C) 2002, 2005  Dmitry V. Levin <ldv@altlinux.org>
-#
-# Executes window manager using wm.d database.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-
-PROG="${0##*/}"
-WM_DIR=/etc/X11/wmsession.d
-
-Usage()
-{
-	[ "$1" = 0 ] || exec >&2
-	cat <<EOF
-Usage: $PROG <window manager> [args]
-       $PROG --print <window manager> [args]
-       $PROG --list
-       $PROG --help
-EOF
-	[ -n "$1" ] && exit "$1" || exit
-}
-
-[ "$1" != '--help' ] || Usage 0
-
-print_only=
-if [ "$1" = '--print' ]; then
-	print_only=1
-	shift
-fi
-
-if [ $# -lt 1 ]; then
-	Usage
-fi
-
-wm=`printf %s "$1" |tr '[:upper:]' '[:lower:]'`
-shift
-
-try_exec_wm()
-{
-	local f
-	for f in "$@"; do
-		if [ -x "$f" ]; then
-			exec "$f" ||:
-		fi
-	done
-}
-
-exec_wm()
-{
-	if [ -n "$print_only" ]; then
-		printf '%s\n' "$*"
-		exit
-	else
-		exec "$@"
-	fi
-}	
-
-is_safe_config()
-{
-	[ -f "$1" -a -r "$1" -a -s "$1" ] || return
-}
-
-found_default=
-scan_wm_dir()
-{
-	local wm="$1" && shift
-	local d
-
-	for d in "$WM_DIR/default" "$WM_DIR"/*; do
-		is_safe_config "$d" || continue
-
-		local n=${d##*/}
-
-		# skip files with names containing dot
-		[ -n "${n##*.*}" ] || continue
-
-		# if found default, skip file named "default"
-		[ -z "$found_default" -o "$n" != default ] || continue
-
-		# fetch pathname for later execution
-		local exec=`sed -ne 's,^EXEC=\(/.\+\)$,\1,pg' "$d" |tail -1`
-
-		if [ -x "$exec" ]; then
-			# fetch WM name
-			local name0=`sed -ne 's,^NAME=\(.\+\)$,\1,pg' "$d" |tail -1`
-			[ -n "$name0" ] || continue
-
-			# canonicalize WM name
-			local name=`printf %s "$name0" |tr '[:upper:]' '[:lower:]'`
-
-			# if in list mode, print and continue
-			if [ "$wm" = '--list' ]; then
-				printf '%s\n' "$name0"
-				[ "$name" != default ] || found_default=1
-				continue
-			fi
-
-			# if found WM, execute
-			if [ "$wm" = default -o "$wm" = "$name" ]; then
-				exec_wm "$exec" "$@"
-			fi
-		fi
-	done
-}
-
-if [ "$wm" = failsafe ]; then
-	if [ -n "$print_only" ]; then
-		echo "/usr/X11R6/bin/xterm -geometry 100x25+0+0 $@"
-	else
-		/usr/X11R6/bin/xterm -geometry 100x25+0+0 &
-		try_exec_wm /usr/X11R6/bin/icewm-light /usr/X11R6/bin/twm
-	fi
-	exit
-fi
-
-prefdm_config=/etc/sysconfig/desktop
-if [ "$wm" = default ] && is_safe_config "$prefdm_config"; then
-	prefdm="$(sed -ne 's/^[[:space:]]*\([^#[:space:]]\+\)[[:space:]]*$/\1/p' "$prefdm_config" |
-			head -1 |tr '[:upper:]' '[:lower:]')"
-	[ -z "$prefdm" ] || scan_wm_dir "$prefdm" "$@"
-fi
-
-scan_wm_dir "$wm" "$@"
-
-if [ "$wm" != '--list' ]; then
-	printf '%s: window manager "%s" not found.\n' "$PROG" "$wm" >&2
-	exit 1
-fi
-
-[ -n "$found_default" ] || echo default
diff -Naur xinitrc-2.4.23/install/usr/X11R6/bin/xscreenlock xinitrc-2.4.24/install/usr/X11R6/bin/xscreenlock
--- xinitrc-2.4.23/install/usr/X11R6/bin/xscreenlock	2005-09-30 03:00:38 +0400
+++ xinitrc-2.4.24/install/usr/X11R6/bin/xscreenlock	1970-01-01 03:00:00 +0300
@@ -1,52 +0,0 @@
-#!/bin/sh
-#
-# $Id: xscreenlock,v 1.3 2005/09/29 23:00:38 ldv Exp $
-# Copyright (C) 2003, 2005  Dmitry V. Levin <ldv@altlinux.org>
-#
-# Wrapper for xscreensaver and xlockmore.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-
-unset n XSCREEN_CUSTOM XSCREEN_SERVER XSCREEN_CLIENT XSCREEN_SERVER_1 XSCREEN_CLIENT_1 XSCREEN_XLOCK ||:
-XSCREEN_CUSTOM="$HOME/.xscreenlock"
-XSCREEN_SERVER="/usr/X11R6/bin/xscreensaver"
-XSCREEN_CLIENT="/usr/X11R6/bin/xscreensaver-command"
-XSCREEN_SERVER_1="/usr/bin/xscreensaver"
-XSCREEN_CLIENT_1="/usr/bin/xscreensaver-command"
-XSCREEN_XLOCK="/usr/X11R6/bin/xlock"
-
-if [ -x "$XSCREEN_CUSTOM" ]; then
-	exec "$XSCREEN_CUSTOM" "$@"
-fi
-
-if [ -x "$XSCREEN_SERVER_1" -a -x "$XSCREEN_CLIENT_1" ]; then
-	XSCREEN_SERVER="$XSCREEN_SERVER_1"
-	XSCREEN_CLIENT="$XSCREEN_CLIENT_1"
-fi
-
-if [ -x "$XSCREEN_SERVER" -a -x "$XSCREEN_CLIENT" ]; then
-	if ! "$XSCREEN_CLIENT" -version >/dev/null 2>&1; then
-		"$XSCREEN_SERVER" -nosplash </dev/null &
-		for n in `seq 1 5`; do
-			"$XSCREEN_CLIENT" -version >/dev/null 2>&1 && break
-			usleep 100000
-		done
-	fi
-	"$XSCREEN_CLIENT" -lock
-elif [ -x "$XSCREEN_XLOCK" ]; then
-	"$XSCREEN_XLOCK"
-fi
-