]>
Commit | Line | Data |
---|---|---|
b1ec4fd4 | 1 | --- XFree86-3.3.3.1/xc/programs/xdm/config/Xsession.rhxdm Wed Jan 3 02:36:27 1996 |
2 | +++ XFree86-3.3.3.1/xc/programs/xdm/config/Xsession Mon Apr 12 19:26:02 1999 | |
3 | @@ -1,5 +1,23 @@ | |
4 | -#!/bin/sh | |
5 | -# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $ | |
18073e5d | 6 | +#!/bin/sh -l |
b1ec4fd4 | 7 | +# Xsession for Red Hat Linux 6.0 |
8 | +# Copyright (c) 1999 Red Hat Software, Inc. | |
9 | + | |
10 | +# clean up after xbanner | |
11 | +if [ -f /usr/X11R6/bin/freetemp ]; then | |
12 | + freetemp | |
13 | +fi | |
14 | + | |
15 | +# clear screen to some sane color | |
16 | +/usr/X11R6/bin/xsetroot -solid "#356390" | |
17 | + | |
18 | +case $# in | |
19 | +1) | |
20 | + case $1 in | |
21 | + failsafe) | |
22 | + exec xterm -geometry 80x24-0-0 | |
23 | + ;; | |
24 | + esac | |
25 | +esac | |
26 | ||
27 | # redirect errors to a file in user's home directory if we can | |
28 | for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" | |
29 | @@ -12,20 +30,15 @@ | |
30 | fi | |
31 | done | |
32 | ||
33 | -case $# in | |
34 | -1) | |
35 | - case $1 in | |
36 | - failsafe) | |
37 | - exec xterm -geometry 80x24-0-0 | |
38 | - ;; | |
39 | - esac | |
40 | -esac | |
41 | - | |
42 | startup=$HOME/.xsession | |
43 | resources=$HOME/.Xresources | |
44 | ||
45 | -if [ -f "$startup" ]; then | |
46 | +if [ -x "$startup" ]; then | |
47 | exec "$startup" | |
48 | +elif [ -x "$HOME/.Xclients" ]; then | |
49 | + exec "$HOME/.Xclients" | |
50 | +elif [ -x /etc/X11/xinit/Xclients ]; then | |
51 | + exec /etc/X11/xinit/Xclients | |
52 | else | |
53 | if [ -f "$resources" ]; then | |
54 | xrdb -load "$resources" | |
55 | --- XFree86-3.3.3.1/xc/programs/xdm/config/Xsetup_0.rhxdm Wed Apr 27 03:20:03 1994 | |
56 | +++ XFree86-3.3.3.1/xc/programs/xdm/config/Xsetup_0 Mon Apr 12 19:26:02 1999 | |
57 | @@ -1,3 +1,6 @@ | |
58 | #!/bin/sh | |
59 | -# $XConsortium: Xsetup_0,v 1.3 93/09/28 14:30:31 gildea Exp $ | |
60 | -xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail | |
61 | +# Xsetup for Red Hat Linux 6.0 | |
62 | +# Copyright (c) 1999 Red Hat Software, Inc. | |
63 | +/usr/X11R6/bin/xsetroot -solid "#356390" | |
64 | +/usr/bin/xsri -geometry +5+5 -avoid 300x250 -keep-aspect \ | |
65 | + /usr/share/pixmaps/redhat/redhat-transparent.png | |
66 | --- XFree86-3.3.3.1/xc/programs/xdm/config/xdm-conf.cpp.rhxdm Sat Feb 10 00:46:54 1996 | |
67 | +++ XFree86-3.3.3.1/xc/programs/xdm/config/xdm-conf.cpp Mon Apr 12 19:26:02 1999 | |
68 | @@ -1,19 +1,19 @@ | |
69 | ! $XConsortium: xdm-conf.cpp /main/3 1996/01/15 15:17:26 gildea $ | |
70 | -DisplayManager.errorLogFile: XDMDIR/xdm-errors | |
71 | -DisplayManager.pidFile: XDMDIR/xdm-pid | |
72 | -DisplayManager.keyFile: XDMDIR/xdm-keys | |
73 | -DisplayManager.servers: XDMDIR/Xservers | |
74 | -DisplayManager.accessFile: XDMDIR/Xaccess | |
75 | +DisplayManager.errorLogFile: /var/log/xdm-error.log | |
76 | +DisplayManager.pidFile: /var/run/xdm.pid | |
77 | +DisplayManager.keyFile: /etc/X11/xdm/xdm-keys | |
78 | +DisplayManager.servers: /etc/X11/xdm/Xservers | |
79 | +DisplayManager.accessFile: /etc/X11/xdm/Xaccess | |
80 | ! All displays should use authorization, but we cannot be sure | |
81 | ! X terminals will be configured that way, so by default | |
82 | ! use authorization only for local displays :0, :1, etc. | |
83 | DisplayManager._0.authorize: true | |
84 | DisplayManager._1.authorize: true | |
85 | ! The following three resources set up display :0 as the console. | |
86 | -DisplayManager._0.setup: XDMDIR/Xsetup_0 | |
87 | -DisplayManager._0.startup: XDMDIR/GiveConsole | |
88 | -DisplayManager._0.reset: XDMDIR/TakeConsole | |
89 | +DisplayManager._0.setup: /etc/X11/xdm/Xsetup_0 | |
90 | +DisplayManager._0.startup: /etc/X11/xdm/GiveConsole | |
91 | +DisplayManager._0.reset: /etc/X11/xdm/TakeConsole | |
92 | ! | |
93 | -DisplayManager*resources: XDMDIR/Xresources | |
94 | -DisplayManager*session: XDMDIR/Xsession | |
95 | +DisplayManager*resources: /etc/X11/xdm/Xresources | |
96 | +DisplayManager*session: /etc/X11/xdm/Xsession | |
97 | DisplayManager*authComplain: false | |
98 | --- XFree86-3.3.3.1/xc/programs/xdm/config/GiveConsole.rhxdm Mon Apr 12 19:33:09 1999 | |
99 | +++ XFree86-3.3.3.1/xc/programs/xdm/config/GiveConsole Mon Apr 12 19:34:11 1999 | |
100 | @@ -8,3 +8,5 @@ | |
101 | # causing serious grief. | |
102 | # | |
103 | chown $USER /dev/console | |
104 | +/usr/X11R6/bin/sessreg -a -w "/var/log/wtmp" -u "/var/run/utmp" \ | |
105 | + -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER | |
106 | --- XFree86-3.3.3.1/xc/programs/xdm/config/TakeConsole.rhxdm Mon Apr 12 19:33:13 1999 | |
107 | +++ XFree86-3.3.3.1/xc/programs/xdm/config/TakeConsole Mon Apr 12 19:34:45 1999 | |
108 | @@ -5,3 +5,5 @@ | |
109 | # | |
110 | chmod 622 /dev/console | |
111 | chown root /dev/console | |
112 | +/usr/X11R6/bin/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \ | |
113 | + -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER |