Commit 6b4ee903 authored by Brian Cameron's avatar Brian Cameron Committed by Brian Cameron

Now expand the GDM configuration files so that they point to the correct

2006-03-05  Brian Cameron  <brian.cameron@sun.com>

        * config/Makefile.am, config/gdm.conf-custom.in, config/gdm.conf.in:
          Now expand the GDM configuration files so that they point to the
          correct location of the file (if a non-default location is used).
          This required renaming gdm.conf-custom to gdm-conf-custom.in.  I
          also reworded the comment secction so that the filenames are only
          mentioned once and further references are to "GDM System Defaults"
          and "GDM Custom Configuration" file since the filenames are
          configurable.  Also fix the fact that @gdmlocaledir@ is not being
          expanded.  Fixes bugs #414155 and #414175.  Patches provided by
          Andreas Hanke <hanke@gmx-topmail.de>.  I also made the comments
          a bit more clear.  Note these configuration files are not
          translated so modifying the comments in it does not break the
          freeze.
        * config/gdm.conf-custom: Removed.

svn path=/trunk/; revision=4639
parent ccd2d9bc
2006-03-05 Brian Cameron <brian.cameron@sun.com>
* config/Makefile.am, config/gdm.conf-custom.in, config/gdm.conf.in:
Now expand the GDM configuration files so that they point to the
correct location of the file (if a non-default location is used).
This required renaming gdm.conf-custom to gdm-conf-custom.in. I
also reworded the comment secction so that the filenames are only
mentioned once and further references are to "GDM System Defaults"
and "GDM Custom Configuration" file since the filenames are
configurable. Also fix the fact that @gdmlocaledir@ is not being
expanded. Fixes bugs #414155 and #414175. Patches provided by
Andreas Hanke <hanke@gmx-topmail.de>. I also made the comments
a bit more clear. Note these configuration files are not
translated so modifying the comments in it does not break the
freeze.
* config/gdm.conf-custom: Removed.
2006-02-27 Brian Cameron <brian.cameron@sun.com>
* gui/modules/keymouselisttener.c, gui/modules/dwellmouselistener.c:
......
pixmapdir = $(datadir)/pixmaps
confdir = $(gdmconfdir)
localedir = $(gdmconfdir)
gdmlocaledir = $(gdmconfdir)
bisessdir = $(datadir)/gdm/BuiltInSessions
instsessdir = $(datadir)/xsessions
initdir = $(gdmconfdir)/Init
......@@ -17,7 +17,7 @@ DESKTOP_FILES = default.desktop CDE.desktop gnome.desktop @SSHDESKTOP@
EXTRA_DIST = \
gdm.conf.in \
gdm.conf-custom \
gdm.conf-custom.in \
$(DESKTOP_FILES) \
default.desktop.in \
gnome.desktop.in.in \
......@@ -36,7 +36,7 @@ EXTRA_DIST = \
gdmprefetchlist.in \
extract-shell.sh
CLEANFILES = Xsession gdm.conf default.desktop gnome.desktop CDE.desktop ssh.desktop Init PreSession PostSession gdmprefetchlist
CLEANFILES = Xsession gdm.conf gdm.conf-custom default.desktop gnome.desktop CDE.desktop ssh.desktop Init PreSession PostSession gdmprefetchlist
Xsession: $(srcdir)/Xsession.in
sed -e 's,[@]XSESSION_SHELL[@],$(XSESSION_SHELL),g' \
......@@ -45,6 +45,7 @@ Xsession: $(srcdir)/Xsession.in
gdm.conf: $(srcdir)/gdm.conf.in
sed -e 's,[@]GDMPREFETCHCMD[@],$(GDMPREFETCHCMD),g' \
-e 's,[@]GDM_CUSTOM_CONF[@],$(GDM_CUSTOM_CONF),g' \
-e 's,[@]GDM_USER_PATH[@],$(GDM_USER_PATH),g' \
-e 's,[@]HALT_COMMAND[@],$(HALT_COMMAND),g' \
-e 's,[@]REBOOT_COMMAND[@],$(REBOOT_COMMAND),g' \
......@@ -61,12 +62,16 @@ gdm.conf: $(srcdir)/gdm.conf.in
-e 's,[@]gdmconfdir[@],$(gdmconfdir),g' \
-e 's,[@]libdir[@],$(libdir),g' \
-e 's,[@]libexecdir[@],$(libexecdir),g' \
-e 's,[@]localedir[@],$(libexecdir),g' \
-e 's,[@]gdmlocaledir[@],$(gdmlocaledir),g' \
-e 's,[@]logdir[@],$(logdir),g' \
-e 's,[@]pixmapdir[@],$(pixmapdir),g' \
-e 's,[@]sbindir[@],$(sbindir),g' \
<$(srcdir)/gdm.conf.in >gdm.conf
gdm.conf-custom: $(srcdir)/gdm.conf-custom.in
sed -e 's,[@]GDM_DEFAULTS_CONF[@],$(GDM_DEFAULTS_CONF),g' \
<$(srcdir)/gdm.conf-custom.in >gdm.conf-custom
gettextfoo.h: XKeepsCrashing Xsession.in
cat $^ | $(srcdir)/extract-shell.sh > gettextfoo.h
......@@ -89,7 +94,7 @@ uninstall-hook:
$(DESTDIR)$(confdir)/XKeepsCrashing \
$(DESTDIR)$(confdir)/Xsession \
$(DESTDIR)$(confdir)/gdmprefetchlist \
$(DESTDIR)$(localedir)/locale.alias \
$(DESTDIR)$(gdmlocaledir)/locale.alias \
$(DESTDIR)$(initdir)/Default \
$(DESTDIR)$(postlogindir)/Default.sample \
$(DESTDIR)$(predir)/Default \
......@@ -124,7 +129,7 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession
$(INSTALL_DATA) gdm.conf $(DESTDIR)$(GDM_DEFAULTS_CONF)
chmod 444 $(DESTDIR)$(GDM_DEFAULTS_CONF)
if test '!' -f $(DESTDIR)$(GDM_CUSTOM_CONF); then \
$(INSTALL_DATA) $(srcdir)/gdm.conf-custom $(DESTDIR)$(GDM_CUSTOM_CONF); \
$(INSTALL_DATA) gdm.conf-custom $(DESTDIR)$(GDM_CUSTOM_CONF); \
chmod 644 $(DESTDIR)$(GDM_CUSTOM_CONF); \
fi
$(INSTALL_DATA) gdm.conf `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`/factory-`basename $(DESTDIR)$(GDM_DEFAULTS_CONF)`
......@@ -132,10 +137,10 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession
$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
-if test -f $(DESTDIR)$(localedir)/locale.alias; then \
cp -f $(DESTDIR)$(localedir)/locale.alias $(DESTDIR)$(localedir)/locale.alias.orig; \
-if test -f $(DESTDIR)$(gdmlocaledir)/locale.alias; then \
cp -f $(DESTDIR)$(gdmlocaledir)/locale.alias $(DESTDIR)$(gdmlocaledir)/locale.alias.orig; \
fi
$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias
$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(gdmlocaledir)/locale.alias
if test '!' -d $(DESTDIR)$(bisessdir); then \
$(mkinstalldirs) $(DESTDIR)$(bisessdir); \
......
# GDM Configuration Customization file.
# GDM Custom Configuration file.
#
# This file is the appropriate place for specifying your customizations to the
# GDM configuration. If you run gdmsetup, it will automatically edit this
......@@ -7,19 +7,32 @@
# options are supported by gdmsetup, so to modify some values it may be
# necessary to modify this file directly by hand.
#
# This file overrides the default configuration settings. These settings
# are stored in the GDM System Defaults configuration file, which is found
# at the following location.
#
# @GDM_DEFAULTS_CONF@.
#
# This file contains comments about the meaning of each configuration option,
# so is also a useful reference. Also refer to the documentation links at
# the end of this comment for further information. In short, to hand-edit
# this file, simply add or modify the key=value combination in the
# appropriate section in the template below this comment section.
#
# For example, if you want to specify a different value for the Enable key
# in the "[debug]" section of your GDM System Defaults configuration file,
# then add "Enable=true" in the "[debug]" section of this file. If the
# key already exists in this file, then simply modify it.
#
# Older versions of GDM used the "gdm.conf" file for configuration. If your
# system has an old gdm.conf file on the system, it will be used instead of
# this file - so changes made to this file will not take effect. Consider
# migrating your configuration to this file and removing the gdm.conf file.
#
# To hand-edit this file, simply add or modify the key=value combination in
# the appropriate section in the template below. Refer to the comments in the
# /usr/share/gdm/defaults.conf file for information about each option. Also
# refer to the reference documentation.
#
# If you hand edit a GDM configuration file, you should run the following
# command to get the GDM daemon to notice the change. Any running GDM GUI
# programs will also be notified to update with the new configuration.
# If you hand edit a GDM configuration file, you can run the following
# command and the GDM daemon will immediately reflect the change. Any
# running GDM GUI programs will also be notified to update with the new
# configuration.
#
# gdmflexiserver --command="UPDATE_CONFIG <configuration key>"
#
......@@ -53,14 +66,15 @@
[debug]
# Note that to disable servers defined in the defaults.conf file (such as
# 0=Standard, you must put a line in this file that says 0=inactive, as
# described in the Configuration section of the GDM documentation.
# Note that to disable servers defined in the GDM System Defaults
# configuration file (such as 0=Standard, you must put a line in this file
# that says 0=inactive, as described in the Configuration section of the GDM
# documentation.
#
[servers]
# Also note, that if you redefine a [server-foo] section, then GDM will
# use the definition in this file, not the defaults.conf file. It is
# currently not possible to disable a [server-foo] section defined
# in the defaults.conf file.
# use the definition in this file, not the GDM System Defaults configuration
# file. It is currently not possible to disable a [server-foo] section
# defined in the GDM System Defaults configuration file.
#
# GDM Configuration file.
# GDM System Defaults Configuration file.
#
# This file should not be updated by hand. Since GDM 2.13.0.4, configuration
# choices in the /etc/X11/gdm/gdm.conf-custom file will override the default
# values specified in this file (installation locations of the configuration
# files may vary for different distros). This defaults.conf file may be
# overwritten on upgrade, so to ensure that your configuration choices are not
# lost, please make sure that your changes are made only the the custom.conf
# file.
# choices in the GDM Custom Configuration file will override the default
# values specified in this file. This GDM System Defaults Configuration file
# may be overwritten on upgrade, so to ensure that your configuration choices
# are not lost, please make sure that your changes are made only the GDM Custom
# Configuration file. The GDM Custom Configuration file is found at the
# following location:
#
# @GDM_CUSTOM_CONF@
#
# If you were using an older version of GDM, your system may have the the older
# gdm.conf configuration file on the system. If so, then this file is used
# instead of the custom.conf file for backwards support. If you make changes
# to the custom.conf file and they seem to not be taking effect, this is likely
# the problem. Consider migrating your configuration to the new custom.conf
# file and removing the gdm.conf file.
# instead of the GDM Custom Configuration file for backwards support. If you
# make changes to the GDM Custom Configuration file and they seem to not be
# taking effect, this is likely the problem. Consider migrating your
# configuration to the new configuration file and removing the gdm.conf file.
#
# You can use the gdmsetup program to graphically edit the gdm.conf-custom
# file. Note that gdmsetup does not support every option in this file, just
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment