Commit b8156037 authored by Brian Cameron's avatar Brian Cameron Committed by Brian Cameron

acconfig.h, configure.in, daemon/Makefile.am, daemon/gdm.c, Change to the

2005-08-02  Brian Cameron  <brian.cameron@sun.com>

        * acconfig.h, configure.in, daemon/Makefile.am, daemon/gdm.c,
          Change to the way the patch introduced on 07/22 works.
          Now GDM continues to install the default gdm.conf file in
          %sysconfdir%/gdm unless the user runs configure with the
          --with-configdir option.  The daemon will now first look
          in this location and then look in the %sysconfdir%/gdm
          directory for the config file.  This allows GDM to better
          support system-wide configuration, but leaves the config
          file in %sysconfdir% for systems that do not need this
          feature.
        * docs/C/gdm.xml: Updated docs.
        * README.install: Updated text to include information about
          HaltCommand and RebootCommand.
parent e45ff0e9
2005-08-02 Brian Cameron <brian.cameron@sun.com>
* Change to the way the patch introduced on 07/22 works. Now
GDM continues to install the default gdm.conf file in
* acconfig.h, configure.in, daemon/Makefile.am, daemon/gdm.c,
Change to the way the patch introduced on 07/22 works.
Now GDM continues to install the default gdm.conf file in
%sysconfdir%/gdm unless the user runs configure with the
--with-configdir option. The daemon will now first look
in this location and then look in the %sysconfdir%/gdm
......
......@@ -2,6 +2,7 @@
#undef VERSION
#undef AT_BINDIR
#undef GETTEXT_PACKAGE
#undef GDM_CONFIGDIR
#undef GDM_USER_PATH
#undef HALT_COMMAND
#undef REBOOT_COMMAND
......
......@@ -818,8 +818,18 @@ else
AT_BINDIR=$EXPANDED_BINDIR
fi
AC_SUBST(AT_BINDIR)
AC_DEFINE_UNQUOTED(AT_BINDIR,"$AT_BINDIR")
withval=""
AC_ARG_WITH(configdir,
[ --with-configdir=<PATH> PATH to Install gdm.conf configuration file [default=EXPANDED_SYSCONFDIR]],)
if test x$withval != x; then
GDM_CONFIGDIR="$withval"
else
GDM_CONFIGDIR=$EXPANDED_SYSCONFDIR
fi
AC_SUBST(GDM_CONFIGDIR)
AC_DEFINE_UNQUOTED(GDM_CONFIGDIR,"$GDM_CONFIGDIR")
AC_ARG_WITH(xevie,
[ --with-xevie=[yes/no] Add XEvIE Xserver extension support [default=no]],,
......
## Process this file with automake to produce makefile.in
DEFS = @DEFS@ -DGDM_SYSCONFDIR_CONFIG_FILE=\"@sysconfdir@/gdm/gdm.conf\" -DGDM_DATADIR_CONFIG_FILE=\"@datadir@/gdm/gdm.conf\"
DEFS = @DEFS@ -DGDM_SYSCONFDIR_CONFIG_FILE=\"@sysconfdir@/gdm/gdm.conf\" -DGDM_INSTALL_CONFIG_FILE=\"$(GDM_CONFIGDIR)/gdm.conf\"
# Note that we have cflags for just about everything even if
# we don't link to everything
......
......@@ -364,12 +364,12 @@ gdm_get_config (struct stat *statbuf)
if (r < 0) {
/* If not found, then check datadir */
VE_IGNORE_EINTR (r = stat (GDM_DATADIR_CONFIG_FILE, statbuf));
VE_IGNORE_EINTR (r = stat (GDM_INSTALL_CONFIG_FILE, statbuf));
if (r < 0) {
gdm_error (_("%s: No GDM configuration file: %s. Using defaults."),
"gdm_config_parse", GDM_DATADIR_CONFIG_FILE);
"gdm_config_parse", GDM_INSTALL_CONFIG_FILE);
} else {
config_file = GDM_DATADIR_CONFIG_FILE;
config_file = GDM_INSTALL_CONFIG_FILE;
}
} else {
config_file = GDM_SYSCONFDIR_CONFIG_FILE;
......
......@@ -723,14 +723,19 @@
<para>
The <filename>gdm.conf</filename> file contains the main configuration
choices for GDM. This file by default is installed to
<filename>&lt;usr/share&gt;</filename>. Since this directory can be
shared across machines, this allows for having a single configuration
for a network of machines. To create machine-specific GDM configuration
settings, the system administrator can place a modified gdm.conf file in
<filename>&lt;etc&gt;/gdm</filename> and it will be used instead.
The gdm --config option may instead be used to specify a configuration
file installed to another location. All GDM utilities (such as
choices for GDM.
</para>
<para>
GDM may be configured to support both system-wide configuration if
built with the <command>--with-configdir</command> option. This
allows the gdm.conf file to be installed to a directory that can
be mounted across multiple-systems. Regardless of whether this
option is used, GDM will first look for the gdm.conf file in the
<filename>&lt;etc&gt;/gdm</filename> directory. This way
machine-specific configuration always overrides the system-wide
defaults. The gdm --config option may also be used to specify the
configuration file location. All GDM utilities (such as
gdmchooser, gdmsetup, etc.) query the GDM daemon process and will use
the same configuration file as being used by the daemon. The GDM2
daemon must be restarted to change the configuration file being used.
......@@ -744,7 +749,7 @@
</para>
<para>
Most other GDM configuration files are located, by default, in the
The other GDM configuration files are located, by default, in the
<filename>&lt;etc&gt;/gdm/</filename> folder or its subdirectories.
However, the location of all configuration files can be defined in
the <filename>gdm.conf</filename> file, so the sysadmin may choose
......@@ -812,8 +817,8 @@ XKeepsCrashing
<para>
Files describing available GDM session follow the freedesktop.org
desktop file specification and are <filename>.desktop</filename>-style
files are installed to <filename>&lt;etc&gt;/X11/sessions/</filename>. This
directory is also read by the KDE desktop manager (KDM) for common
files are installed to <filename>&lt;etc&gt;/X11/sessions/</filename>.
This directory is also read by the KDE desktop manager (KDM) for common
configuration. Next the directory
<filename>&lt;share&gt;/gdm/BuiltInSessions/</filename> is read for
GDM specific built-in sessions (KDM hardcodes these at time of
......@@ -821,8 +826,8 @@ XKeepsCrashing
<filename>&lt;share&gt;/xsessions/</filename> (which should be
<filename>/usr/share/xsessions/</filename> if you really wish to
cooperate with KDM) where desktop packages can install their session
files. The directories under the <filename>&lt;etc&gt;</filename> should be
reserved for configuration. The desktop file specification approach
files. The directories under the <filename>&lt;etc&gt;</filename> should
be reserved for configuration. The desktop file specification approach
makes it easy for package management systems to install window managers
and different session types without requiring the sysadmin to edit files.
See the <filename>SessionDesktopDir</filename> configuration key for
......@@ -977,13 +982,15 @@ XKeepsCrashing
<para>
The daemon and the accompanying utilities use a common
configuration file: <filename>gdm.conf</filename>. To support
multiple machines sharing the same configuration file, this file
is installed by default to <filename>/usr/share/gdm</filename>.
To specify a machine-specific configuration, the system
administrator may place a modified configuration file
in <filename>&lt;etc&gt;/gdm</filename> and GDM will instead use
this file. The gdm --config option may instead be used to specify
configuration file: <filename>gdm.conf</filename>. GDM may be
configured to support both system-wide configuration if
built with the <command>--with-configdir</command> option. This
allows the gdm.conf file to be installed to a directory that can
be mounted across multiple-systems. Regardless of whether this
option is used, GDM will first look for the gdm.conf file in the
<filename>&lt;etc&gt;/gdm</filename> directory. This way
machine-specific configuration always overrides the system-wide
defaults. The gdm --config option may instead be used to specify
a configuration file installed to another location. All GDM
utilities (such as All GDM utilities (such as gdmchooser,
gdmsetup, etc.) query the GDM daemon process and will use the same
......
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