2006-10-06 14:41:37 +00:00
|
|
|
--- gdm-2.16.0/config/gdm.conf.in.change-defaults 2006-08-03 13:36:26.000000000 -0400
|
|
|
|
|
+++ gdm-2.16.0/config/gdm.conf.in 2006-10-06 10:40:13.000000000 -0400
|
|
|
|
|
@@ -65,9 +65,9 @@
|
2006-09-07 04:35:20 +00:00
|
|
|
# should leave this alone.
|
|
|
|
|
#Chooser=@libexecdir@/gdmchooser
|
|
|
|
|
|
|
|
|
|
-# The greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to
|
|
|
|
|
-# get the new graphical greeter.
|
|
|
|
|
-#Greeter=@libexecdir@/gdmlogin
|
|
|
|
|
+# The greeter for local (non-xdmcp) logins. Change gdmgreeter to gdmlogin to
|
|
|
|
|
+# get the boring greeter.
|
|
|
|
|
+Greeter=@libexecdir@/gdmgreeter
|
|
|
|
|
|
|
|
|
|
# The greeter for xdmcp logins, usually you want a less graphically intensive
|
|
|
|
|
# greeter here so it's better to leave this with gdmlogin
|
2006-10-06 14:41:37 +00:00
|
|
|
@@ -84,16 +84,14 @@
|
2006-09-07 04:35:20 +00:00
|
|
|
# Default path to set. The profile scripts will likely override this value.
|
|
|
|
|
# This value will be overridden with the value from /etc/default/login if it
|
|
|
|
|
# contains "ROOT=<pathvalue>".
|
|
|
|
|
-#DefaultPath=@GDM_USER_PATH@
|
|
|
|
|
+DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin
|
|
|
|
|
# Default path for root. The profile scripts will likely override this value.
|
|
|
|
|
# This value will be overridden with the value from /etc/default/login if it
|
|
|
|
|
# contains "SUROOT=<pathvalue>".
|
|
|
|
|
-#RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@
|
|
|
|
|
+RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
|
|
|
|
|
|
|
|
|
|
-# If you are having trouble with using a single server for a long time and want
|
|
|
|
|
-# GDM to kill/restart the server, turn this on. On Solaris, this value is
|
|
|
|
|
-# always true and this configuration setting is ignored.
|
|
|
|
|
-#AlwaysRestartServer=false
|
|
|
|
|
+# Whether to restart X server after the user logs out or not.
|
|
|
|
|
+AlwaysRestartServer=true
|
|
|
|
|
|
|
|
|
|
# User and group used for running GDM GUI applicaitons. By default this is set
|
|
|
|
|
# to user "gdm" and group "gdm". This user/group should have very limited
|
2006-10-06 14:41:37 +00:00
|
|
|
@@ -124,22 +122,21 @@
|
2006-09-07 04:35:20 +00:00
|
|
|
XKeepsCrashing=@gdmconfdir@/XKeepsCrashing
|
|
|
|
|
# Reboot, Halt and suspend commands, you can add different commands separated
|
|
|
|
|
# by a semicolon. GDM will use the first one it can find.
|
|
|
|
|
-#RebootCommand=@REBOOT_COMMAND@
|
|
|
|
|
-#HaltCommand=@HALT_COMMAND@
|
|
|
|
|
-#SuspendCommand=@SUSPEND_COMMAND@
|
|
|
|
|
+RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot
|
|
|
|
|
+HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff
|
|
|
|
|
# Probably should not touch the below this is the standard setup.
|
|
|
|
|
ServAuthDir=@authdir@
|
|
|
|
|
# This is our standard startup script. A bit different from a normal X
|
|
|
|
|
# session, but it shares a lot of stuff with that. See the provided default
|
|
|
|
|
# for more information.
|
|
|
|
|
-BaseXsession=@gdmconfdir@/Xsession
|
|
|
|
|
+BaseXsession=/etc/X11/xinit/Xsession
|
|
|
|
|
# This is a directory where .desktop files describing the sessions live. It is
|
|
|
|
|
# really a PATH style variable since 2.4.4.2 to allow actual interoperability
|
|
|
|
|
# with KDM. Note that <dmconfdir>/Sessions is there for backwards
|
|
|
|
|
# compatibility reasons with 2.4.4.x.
|
|
|
|
|
#SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/
|
|
|
|
|
# This is the default .desktop session. One of the ones in SessionDesktopDir
|
|
|
|
|
-#DefaultSession=gnome.desktop
|
|
|
|
|
+DefaultSession=default.desktop
|
|
|
|
|
# Better leave this blank and HOME will be used. You can use syntax ~/ below
|
|
|
|
|
# to indicate home directory of the user. You can also set this to something
|
|
|
|
|
# like /tmp if you don't want the authorizations to be in home directories.
|
2006-10-06 14:41:37 +00:00
|
|
|
@@ -147,11 +144,11 @@
|
2006-09-07 04:35:20 +00:00
|
|
|
# is the home directory the UserAuthFBDir will still be used in case the home
|
|
|
|
|
# directory is NFS, see security/NeverPlaceCookiesOnNFS to override this
|
|
|
|
|
# behavior.
|
|
|
|
|
-UserAuthDir=
|
|
|
|
|
+UserAuthDir=/tmp
|
|
|
|
|
# Fallback directory for writing authorization file if user's home directory
|
|
|
|
|
# is not writable.
|
|
|
|
|
UserAuthFBDir=/tmp
|
|
|
|
|
-UserAuthFile=.Xauthority
|
|
|
|
|
+#UserAuthFile=.Xauthority
|
|
|
|
|
# The X server to use if we can't figure out what else to run.
|
|
|
|
|
StandardXServer=@X_SERVER@
|
|
|
|
|
# The maximum number of flexible X servers to run.
|
2006-10-06 14:41:37 +00:00
|
|
|
@@ -294,7 +291,7 @@
|
2006-09-07 04:35:20 +00:00
|
|
|
#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
|
|
|
|
|
|
|
|
|
|
# The GTK+ theme to use for the GUI.
|
|
|
|
|
-#GtkTheme=Default
|
|
|
|
|
+GtkTheme=Clearlooks
|
|
|
|
|
# If to allow changing the GTK+ (widget) theme from the greeter. Currently
|
|
|
|
|
# this only affects the standard greeter as the graphical greeter does not yet
|
|
|
|
|
# have this ability.
|
2006-10-06 14:41:37 +00:00
|
|
|
@@ -315,7 +312,7 @@
|
2006-09-07 04:35:20 +00:00
|
|
|
# themed login (gdmgreeter).
|
|
|
|
|
#
|
|
|
|
|
# The standard login has a title bar that the user can move.
|
|
|
|
|
-#TitleBar=true
|
|
|
|
|
+TitleBar=false
|
|
|
|
|
# Don't allow user to move the standard login window. Only makes sense if
|
|
|
|
|
# TitleBar is on.
|
|
|
|
|
#LockPosition=false
|
2006-10-06 14:41:37 +00:00
|
|
|
@@ -339,7 +336,7 @@
|
2006-09-07 04:35:20 +00:00
|
|
|
# User ID's less than the MinimalUID value will not be included in the face
|
|
|
|
|
# browser or in the gdmselection list for Automatic/Timed login. They will not
|
|
|
|
|
# be displayed regardless of the settings for Include and Exclude.
|
|
|
|
|
-#MinimalUID=100
|
|
|
|
|
+MinimalUID=500
|
|
|
|
|
# Users listed in Include will be included in the face browser and in the
|
|
|
|
|
# gdmsetup selection list for Automatic/Timed login. Users should be separated
|
|
|
|
|
# by commas.
|
2006-10-06 14:41:37 +00:00
|
|
|
@@ -365,7 +362,7 @@
|
2006-09-07 04:35:20 +00:00
|
|
|
# file, although GDM will be able to read a standard locale.alias file as well.
|
|
|
|
|
#LocaleFile=@gdmlocaledir@/locale.alias
|
|
|
|
|
# Logo shown in the standard greeter.
|
|
|
|
|
-#Logo=@pixmapdir@/gdm-foot-logo.png
|
|
|
|
|
+Logo=
|
|
|
|
|
# Logo shown on file chooser button in gdmsetup (do not modify this value).
|
|
|
|
|
#ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png
|
|
|
|
|
# The standard greeter should shake if a user entered the wrong username or
|
2006-10-06 14:41:37 +00:00
|
|
|
@@ -412,8 +409,9 @@
|
2006-09-07 04:35:20 +00:00
|
|
|
# The Standard greeter (gdmlogin) uses BackgroundColor as the background
|
|
|
|
|
# color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor
|
|
|
|
|
# as the background color.
|
|
|
|
|
-BackgroundColor=#76848F
|
|
|
|
|
-GraphicalThemedColor=#76848F
|
|
|
|
|
+BackgroundColor=#20305a
|
|
|
|
|
+GraphicalThemedColor=#000000
|
|
|
|
|
+
|
|
|
|
|
# XDMCP session should only get a color, this is the sanest setting since you
|
|
|
|
|
# don't want to take up too much bandwidth
|
|
|
|
|
#BackgroundRemoteOnlyColor=true
|
2006-10-06 14:41:37 +00:00
|
|
|
@@ -434,7 +432,7 @@
|
2006-09-07 04:35:20 +00:00
|
|
|
# Show the Failsafe sessions. These are much MUCH nicer (focus for xterm for
|
|
|
|
|
# example) and more failsafe then those supplied by scripts so distros should
|
|
|
|
|
# use this rather then just running an xterm from a script.
|
|
|
|
|
-#ShowGnomeFailsafeSession=true
|
|
|
|
|
+ShowGnomeFailsafeSession=false
|
|
|
|
|
#ShowXtermFailsafeSession=true
|
|
|
|
|
# Normally there is a session type called 'Last' that is shown which refers to
|
|
|
|
|
# the last session the user used. If off, we will be in 'switchdesk' mode
|
2006-10-06 14:41:37 +00:00
|
|
|
@@ -454,7 +452,7 @@
|
2006-09-07 04:35:20 +00:00
|
|
|
# list then provide a list that is delimited by /: to the GraphicalThemes
|
|
|
|
|
# key and set GraphicalThemeRand to true. Otherwise use GraphicalTheme
|
|
|
|
|
# and specify just one theme.
|
|
|
|
|
-#GraphicalTheme=circles
|
|
|
|
|
+GraphicalTheme=FedoraDNA
|
|
|
|
|
#GraphicalThemes=circles/:happygnome
|
|
|
|
|
GraphicalThemeDir=@datadir@/gdm/themes/
|
|
|
|
|
GraphicalThemeRand=false
|
2006-10-06 14:41:37 +00:00
|
|
|
@@ -558,7 +556,7 @@
|
|
|
|
|
# Definition of the standard X server.
|
|
|
|
|
[server-Standard]
|
|
|
|
|
name=Standard server
|
|
|
|
|
-command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@
|
|
|
|
|
+command=@X_SERVER@ -br @X_CONFIG_OPTIONS@ @XEVIE_OPTION@
|
|
|
|
|
flexible=true
|
|
|
|
|
# Indicates that the X server should be started at a different process
|
|
|
|
|
# priority. Values can be any integer value accepted by the setpriority C
|
