- invoke standard X server with -br option to ensure we get a black root on

startup
This commit is contained in:
Ray Strode 2006-10-06 14:41:37 +00:00
parent d8d7cb8b8f
commit bdb02acdad
2 changed files with 27 additions and 14 deletions

View File

@ -1,6 +1,6 @@
--- gdm-2.15.6/config/gdm.conf.in.change-defaults 2006-04-27 20:43:31.000000000 -0400
+++ gdm-2.15.6/config/gdm.conf.in 2006-07-21 15:20:33.000000000 -0400
@@ -59,9 +59,9 @@
--- 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 @@
# should leave this alone.
#Chooser=@libexecdir@/gdmchooser
@ -13,7 +13,7 @@
# The greeter for xdmcp logins, usually you want a less graphically intensive
# greeter here so it's better to leave this with gdmlogin
@@ -78,16 +78,14 @@
@@ -84,16 +84,14 @@
# 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>".
@ -34,7 +34,7 @@
# 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
@@ -118,22 +116,21 @@
@@ -124,22 +122,21 @@
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.
@ -61,7 +61,7 @@
# 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.
@@ -141,11 +138,11 @@
@@ -147,11 +144,11 @@
# is the home directory the UserAuthFBDir will still be used in case the home
# directory is NFS, see security/NeverPlaceCookiesOnNFS to override this
# behavior.
@ -75,7 +75,7 @@
# 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.
@@ -288,7 +285,7 @@
@@ -294,7 +291,7 @@
#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
# The GTK+ theme to use for the GUI.
@ -84,7 +84,7 @@
# 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.
@@ -309,7 +306,7 @@
@@ -315,7 +312,7 @@
# themed login (gdmgreeter).
#
# The standard login has a title bar that the user can move.
@ -93,7 +93,7 @@
# Don't allow user to move the standard login window. Only makes sense if
# TitleBar is on.
#LockPosition=false
@@ -333,7 +330,7 @@
@@ -339,7 +336,7 @@
# 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.
@ -102,7 +102,7 @@
# 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.
@@ -359,7 +356,7 @@
@@ -365,7 +362,7 @@
# 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.
@ -111,7 +111,7 @@
# 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
@@ -406,8 +403,9 @@
@@ -412,8 +409,9 @@
# The Standard greeter (gdmlogin) uses BackgroundColor as the background
# color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor
# as the background color.
@ -123,7 +123,7 @@
# 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
@@ -428,7 +426,7 @@
@@ -434,7 +432,7 @@
# 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.
@ -132,7 +132,7 @@
#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
@@ -448,7 +446,7 @@
@@ -454,7 +452,7 @@
# 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.
@ -141,3 +141,12 @@
#GraphicalThemes=circles/:happygnome
GraphicalThemeDir=@datadir@/gdm/themes/
GraphicalThemeRand=false
@@ -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

View File

@ -16,7 +16,7 @@
Summary: The GNOME Display Manager.
Name: gdm
Version: 2.16.0
Release: 11%{?dist}
Release: 12%{?dist}
Epoch: 1
License: LGPL/GPL
Group: User Interface/X
@ -312,6 +312,10 @@ fi
%attr(1770, root, gdm) %dir %{_localstatedir}/gdm
%changelog
* Fri Oct 6 2006 Ray Strode <rstrode@redhat.com> - 1:2.16.0-12.fc6
- invoke standard X server with -br option to ensure we get a
black root on startup
* Thu Oct 5 2006 Ray Strode <rstrode@redhat.com> - 1:2.16.0-11.fc6
- make monitoring code more reliable (bug 208018)