1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
--- config/gdm.conf.in.orig Wed Aug 7 23:50:26 2002
+++ config/gdm.conf.in Fri Aug 9 17:13:47 2002
@@ -17,7 +17,7 @@
# want gdm to kill/restart the server, turn this on
AlwaysRestartServer=false
Configurator=@EXPANDED_GDMCONFIGDIR@/gdmsetup --disable-sound --disable-crash-dialog
-GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session
+GnomeDefaultSession=@EXPANDED_DATADIR@/default.session
Chooser=@EXPANDED_BINDIR@/gdmchooser
DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init
@@ -26,7 +26,7 @@
Group=gdm
HaltCommand=/sbin/shutdown -h now
KillInitClients=true
-LogDir=@EXPANDED_AUTHDIR@
+LogDir=/var/log
PidFile=/var/run/gdm.pid
PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/
PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/
@@ -35,7 +35,7 @@
FailsafeXServer=
XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing
RebootCommand=/sbin/shutdown -r now
-RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
+RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
ServAuthDir=@EXPANDED_AUTHDIR@
SessionDir=@EXPANDED_SYSCONFDIR@/gdm/Sessions/
SuspendCommand=
@@ -46,9 +46,9 @@
TimedLoginEnable=false
TimedLogin=
TimedLoginDelay=30
-StandardXServer=/usr/X11R6/bin/X
+StandardXServer=@EXPANDED_BINDIR@/X
FlexibleXServers=5
-Xnest=/usr/X11R6/bin/Xnest -name Xnest -kb
+Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest
[security]
# If any distributions ship with this one off, they should be shot
@@ -81,7 +81,7 @@
Willing=@EXPANDED_SYSCONFDIR@/gdm/Xwilling
[gui]
-GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc
+GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc
MaxIconWidth=128
MaxIconHeight=128
@@ -90,7 +90,7 @@
ConfigAvailable=true
Browser=false
DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png
-DefaultLocale=en_US
+DefaultLocale=en_US.ISO_8859-1
# These are things excluded from the face browser, not from logging in
Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
GlobalFaceDir=@EXPANDED_DATADIR@/faces/
@@ -159,7 +159,7 @@
[server-Standard]
name=Standard server
-command=/usr/X11R6/bin/X
+command=@EXPANDED_BINDIR@/X
flexible=true
# To use this server type you should add -query host or -indirect host
@@ -167,7 +167,7 @@
[server-Terminal]
name=Terminal server
# Add -terminate to make things behave more nicely
-command=/usr/X11R6/bin/X -terminate
+command=@EXPANDED_BINDIR@/X -terminate
# Make this not appear in the flexible servers (we need extra params
# anyway, and terminate would be bad for xdmcp)
flexible=false
|