diff -upr gdm-2.19.5-pre/config/gdm.conf.in gdm-2.19.5-post/config/gdm.conf.in --- gdm-2.19.5-pre/config/gdm.conf.in 2007-07-30 13:51:14.000000000 -0500 +++ gdm-2.19.5-post/config/gdm.conf.in 2007-08-03 17:35:14.000000000 -0500 @@ -68,11 +68,11 @@ TimedLoginDelay=30 # The greeter for attached (non-xdmcp) logins. Change gdmlogin to gdmgreeter # to get the new graphical greeter. -#Greeter=@libexecdir@/gdmlogin +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 -#RemoteGreeter=@libexecdir@/gdmlogin +RemoteGreeter=@libexecdir@/gdmgreeter # Launch the greeter with an additional list of colon separated GTK+ modules. # This is useful for enabling additional feature support e.g. GNOME @@ -86,10 +86,12 @@ TimedLoginDelay=30 # This value will be overridden with the value from /etc/default/login if it # contains "ROOT=". #DefaultPath=@GDM_USER_PATH@ +DefaultPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/var/lib/dosemu:/usr/games:/opt/bin:/opt/kde3/bin:/opt/kde2/bin:/opt/kde/bin:/usr/openwin/bin:/opt/cross/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=". #RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@ +RootPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/var/lib/dosemu:/usr/games:/opt/bin:/opt/kde3/bin:/opt/kde2/bin:/opt/kde/bin:/usr/openwin/bin:/opt/cross/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 @@ -126,9 +128,14 @@ XKeepsCrashing=@gdmconfdir@/XKeepsCrashi # # 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=@REBOOT_COMMAND@ +#HaltCommand=@HALT_COMMAND@ +#SuspendCommand=@SUSPEND_COMMAND@ + +RebootCommand=/sbin/shutdown -r now +HaltCommand=/sbin/shutdown -h now +SuspendCommand=/usr/bin/powersave --suspend-to-disk + # The following options specify how GDM system commands are supported. # @@ -163,7 +170,7 @@ BaseXsession=@gdmconfdir@/Xsession # really a PATH style variable since 2.4.4.2 to allow actual interoperability # with KDM. Note that /Sessions is there for backwards # compatibility reasons with 2.4.4.x. -#SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/ +SessionDesktopDir=/usr/share/xsessions/:@EXPANDED_SYSCONFDIR@/dm/Sessions/:@EXPANDED_DATADIR@/gdm/BuiltInSessions/ # This is the default .desktop session. One of the ones in SessionDesktopDir #DefaultSession=gnome.desktop # Better leave this blank and HOME will be used. You can use syntax ~/ below @@ -259,7 +266,7 @@ CheckDirOwner=true # If your HOME is managed by automounter, set to true SupportAutomount=false # Number of seconds to wait after a failed login -#RetryDelay=1 +RetryDelay=1 # Maximum size of a file we wish to read. This makes it hard for a user to DoS # us by using a large file. #UserMaxFile=65536 @@ -339,17 +346,18 @@ Enable=false #PingIntervalSeconds=15 # The port. 177 is the standard port so better keep it that way. #Port=177 -# Willing script, none is shipped and by default we'll send hostname system id. -# But if you supply something here, the output of this script will be sent as -# status of this host so that the chooser can display it. You could for -# example send load, or mail details for some user, or some such. -#Willing=@gdmconfdir@/Xwilling +# Willing script, none is shipped, X11's one is used by default. If +# none is present we'll send hostname system id. But if you supply +# something here, the output of this script will be sent as status of +# this host so that the chooser can display it. You could for example +# send load, or mail details for some user, or some such. +Willing=/etc/X11/xdm/Xwilling [gui] # The specific gtkrc file we use. It should be the full path to the gtkrc that # we need. Unless you need a specific gtkrc that doesn't correspond to a # specific theme, then just use the GtkTheme key. -#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc +GtkRC=@datadir@/themes/Industrial/gtk-2.0/gtkrc # The GTK+ theme to use for the GUI. #GtkTheme=Default @@ -376,7 +384,7 @@ Enable=false #TitleBar=true # Don't allow user to move the standard login window. Only makes sense if # TitleBar is on. -#LockPosition=false +LockPosition=true # Set a position for the standard login window rather then just centering the # window. If you enter negative values for the position it is taken as an # offset from the right or bottom edge. @@ -397,7 +405,7 @@ Browser=false # 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. @@ -428,7 +436,7 @@ Browser=false #ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png # The standard greeter should shake if a user entered the wrong username or # password. Kind of cool looking -#Quiver=true +Quiver=false # The Actions menu (formerly system menu) is shown in the greeter, this is the # menu that contains reboot, shutdown, suspend, config and chooser. None of @@ -465,12 +473,12 @@ DefaultRemoteWelcome=true # Background settings for the standard greeter: # Type can be 0=None, 1=Image & Color, 2=Color, 3=Image #BackgroundType=2 -#BackgroundImage= +BackgroundImage=0 #BackgroundScaleToFit=true # The Standard greeter (gdmlogin) uses BackgroundColor as the background # color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor # as the background color. -BackgroundColor=#76848F +BackgroundColor=#000000 GraphicalThemedColor=#76848F # XDMCP session should only get a color, this is the sanest setting since you # don't want to take up too much bandwidth @@ -512,7 +520,7 @@ GraphicalThemedColor=#76848F # 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=GDM-SuSE #GraphicalThemes=circles/:happygnome GraphicalThemeDir=@datadir@/gdm/themes/ GraphicalThemeRand=false @@ -529,6 +537,7 @@ GraphicalThemeRand=false # executable (see daemon/SoundProgram) it will play that file instead of just # beeping. #SoundOnLogin=true +SoundOnLogin=false #SoundOnLoginFile= # If SoundOnLoginSuccess, then the greeter will play a sound (as above) when a # user successfully logs in. @@ -629,7 +638,7 @@ Gestures=false [server-Standard] name=Standard server -command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ +command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ -br 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 Only in gdm-2.19.5-post/config: gdm.conf.in.orig Only in gdm-2.19.5-post: error.14848