Commit 7be01d72 authored by Brian Cameron's avatar Brian Cameron Committed by Brian Cameron

Changed default face directory to EXPANDED_DATADIR/pixmaps/faces since

Thu Mar 10 17:50:00 2005  Brian Cameron <Brian.Cameron@Sun.Com>

        * daemon/gdm.h, config/gdm.conf.in: Changed default face
          directory to EXPANDED_DATADIR/pixmaps/faces since putting
          the faces subdirectory in pixmaps simply makes more
          sense.
        * Makefile.am, acconfig.h, configure.in, gdmsetup-security.in,
          daemon/Makefile.am, daemon/gdm.h, daemon/gdm.in, daemon/slave.c,
          gui/Makefile.am, gui/gdmsetup.c, gui/greeter/Makefile.am,
          gui/greeter/greeter.c: Changed the way GDM files are installed.
          Now all programs intended to be run by root are in
          EXPANDED_SBINDIR (gdm/gdm-binary/gdmsetup), all programs
          that are not intended to be run by end-users are in
          EXPANDED_LIBEXEC (gdmchooser/gdmgreeter/gdmlogin).  Removed
          gdmconfig wrapper script and gdm Xnest symlink since they
          only serve to clutter the filesystem.  I announced this
          change in the 2.6.0.8 release notes and will be bumping
          the next release to 2.6 because of this change and the
          change to the default face directory.

        * configure.in, gui/faces/*: Add default faces.  Images
          provided by Jaap A. Haitsma.  Refer to bugzilla bug
          #149838.
        * gui/gdmphotosetup.c: Now browser will look in the system
          face directory first, in EXPANDED_DATADIR/pixmaps if the
          default face directory does not exist.
        * config/Makefile.am: Changed name of Default to Init since
          that follows the naming standard used by the other scripts.
          Fixes bug 118278.
        * docs/C/gdm.xml: Updated docs with information about
          the changes in today's commits.
parent 5a6d64f4
Thu Mar 10 17:50:00 2005 Brian Cameron <Brian.Cameron@Sun.Com>
* daemon/gdm.h, config/gdm.conf.in: Changed default face
directory to EXPANDED_DATADIR/pixmaps/faces since putting
the faces subdirectory in pixmaps simply makes more
sense.
* Makefile.am, acconfig.h, configure.in, gdmsetup-security.in,
daemon/Makefile.am, daemon/gdm.h, daemon/gdm.in, daemon/slave.c,
gui/Makefile.am, gui/gdmsetup.c, gui/greeter/Makefile.am,
gui/greeter/greeter.c: Changed the way GDM files are installed.
Now all programs intended to be run by root are in
EXPANDED_SBINDIR (gdm/gdm-binary/gdmsetup), all programs
that are not intended to be run by end-users are in
EXPANDED_LIBEXEC (gdmchooser/gdmgreeter/gdmlogin). Removed
gdmconfig wrapper script and gdm Xnest symlink since they
only serve to clutter the filesystem. I announced this
change in the 2.6.0.8 release notes and will be bumping
the next release to 2.6 because of this change and the
change to the default face directory.
* configure.in, gui/faces/*: Add default faces. Images
provided by Jaap A. Haitsma. Refer to bugzilla bug
#149838.
* gui/gdmphotosetup.c: Now browser will look in the system
face directory first, in EXPANDED_DATADIR/pixmaps if the
default face directory does not exist.
* config/Makefile.am: Changed name of Default to Init since
that follows the naming standard used by the other scripts.
Fixes bug 118278.
* docs/C/gdm.xml: Updated docs with information about
the changes in today's commits.
Thu Mar 10 14:35:00 2005 Brian Cameron <Brian.Cameron@Sun.Com>
* daemon/gdm.h, daemon/gdm.c: Added GET_CONFIG gdmflexiserver
......
......@@ -24,11 +24,10 @@ EXTRA_DIST = \
gdm-stop.in \
gdm-restart.in \
gdm-safe-restart.in \
gdmconfig \
xmldocs.make \
omf.make
sbin_SCRIPTS = gdm-stop gdm-restart gdm-safe-restart gdmconfig
sbin_SCRIPTS = gdm-stop gdm-restart gdm-safe-restart
install-data-local: gdmsetup-security
if CONSOLE_HELPER
......
......@@ -40,7 +40,6 @@
#undef EXPANDED_AUTHDIR
#undef EXPANDED_DATADIR
#undef EXPANDED_BINDIR
#undef EXPANDED_GDMCONFIGDIR
#undef EXPANDED_LIBEXECDIR
#undef EXPANDED_LIBDIR
#undef EXPANDED_LOCALEDIR
......
#!/bin/sh
# Stolen from the debian kdm setup, aren't I sneaky
# Plus a lot of fun stuff added
# -George
PATH=@X_PATH@:$PATH
OLD_IFS=$IFS
gdmwhich () {
COMMAND="$1"
OUTPUT=
IFS=:
for dir in $PATH
do
if test -x "$dir/$COMMAND" ; then
if test "x$OUTPUT" = "x" ; then
OUTPUT="$dir/$COMMAND"
fi
fi
done
IFS=$OLD_IFS
echo "$OUTPUT"
}
sysmodmap=/etc/X11/Xmodmap
XMODMAP=`gdmwhich xmodmap`
if [ x$XMODMAP != x ] ; then
if [ x$GDM_PARENT_DISPLAY = x ]; then
if [ -f $sysmodmap ]; then
$XMODMAP $sysmodmap
fi
else
( DISPLAY=$GDM_PARENT_DISPLAY XAUTHORITY=$GDM_PARENT_XAUTHORITY $XMODMAP -pke ) | $XMODMAP -
fi
#
# Switch Sun's Alt and Meta mod mappings
#
UNAME=`gdmwhich uname`
PROCESSOR=`$UNAME -p`
if [ x$PROCESSOR = xsparc ]; then
if $XMODMAP | /usr/bin/grep mod4 | /usr/bin/grep Alt > /dev/null 2>/dev/null
then
$XMODMAP -e "clear Mod1" \
-e "clear Mod4" \
-e "add Mod1 = Alt_L" \
-e "add Mod1 = Alt_R" \
-e "add Mod4 = Meta_L" \
-e "add Mod4 = Meta_R"
fi
fi
fi
SETXKBMAP=`gdmwhich setxkbmap`
if [ x$SETXKBMAP != x ] ; then
# FIXME: is this all right? Is this completely on crack?
# What this does is move the xkb configuration from the GDM_PARENT_DISPLAY
# FIXME: This should be done in code. Or there must be an easier way ...
if [ -n "$GDM_PARENT_DISPLAY" ]; then
XKBSETUP=`( DISPLAY=$GDM_PARENT_DISPLAY XAUTHORITY=$GDM_PARENT_XAUTHORITY $SETXKBMAP -v )`
if [ -n "$XKBSETUP" ]; then
XKBKEYMAP=`echo "$XKBSETUP" | grep '^keymap' | awk '{ print $2 }'`
XKBTYPES=`echo "$XKBSETUP" | grep '^types' | awk '{ print $2 }'`
XKBCOMPAT=`echo "$XKBSETUP" | grep '^compat' | awk '{ print $2 }'`
XKBSYMBOLS=`echo "$XKBSETUP" | grep '^symbols' | awk '{ print $2 }'`
XKBGEOMETRY=`echo "$XKBSETUP" | grep '^geometry' | awk '{ print $2 }'`
if [ -n "$XKBKEYMAP" ]; then
$SETXKBMAP -keymap "$XKBKEYMAP"
elif [ -n "$XKBTYPES" -a -n "$XKBCOMPAT" -a -n "$XKBSYMBOLS" -a -n "$XKBGEOMETRY" ]; then
$SETXKBMAP -types "$XKBTYPES" -compat "$XKBCOMPAT" -symbols "$XKBSYMBOLS" -geometry "$XKBGEOMETRY"
elif [ -n "$XKBTYPES" -a -n "$XKBCOMPAT" -a -n "$XKBSYMBOLS" ]; then
$SETXKBMAP -types "$XKBTYPES" -compat "$XKBCOMPAT" -symbols "$XKBSYMBOLS"
elif [ -n "$XKBSYMBOLS" ]; then
$SETXKBMAP -symbols "$XKBSYMBOLS"
fi
fi
fi
fi
exit 0
......@@ -26,7 +26,7 @@ EXTRA_DIST = \
gdm \
gdm-autologin \
locale.alias \
Default.in \
Init.in \
PostSession.in \
PreSession.in \
PostLogin \
......@@ -59,7 +59,7 @@ uninstall-hook:
$(DESTDIR)$(predir)/Default \
$(DESTDIR)$(postdir)/Default
install-data-hook: gdm.conf Xsession gnome.desktop default.desktop CDE.desktop Default PostSession PreSession
install-data-hook: gdm.conf Xsession gnome.desktop default.desktop CDE.desktop Init PostSession PreSession
if test '!' -d $(DESTDIR)$(confdir); then \
$(mkinstalldirs) $(DESTDIR)$(confdir); \
chmod 755 $(DESTDIR)$(confdir); \
......@@ -126,9 +126,9 @@ install-data-hook: gdm.conf Xsession gnome.desktop default.desktop CDE.desktop D
chmod 755 $(DESTDIR)$(initdir); \
fi
-if test -f $(DESTDIR)$(initdir)/Default; then \
cp -f $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \
cp -f $(DESTDIR)$(initdir)/Init $(DESTDIR)$(initdir)/Default.orig; \
fi
$(INSTALL_SCRIPT) Default $(DESTDIR)$(initdir)/Default
$(INSTALL_SCRIPT) Init $(DESTDIR)$(initdir)/Default
if test '!' -d $(DESTDIR)$(postlogindir); then \
$(mkinstalldirs) $(DESTDIR)$(postlogindir); \
......
......@@ -273,7 +273,7 @@ Browser=false
# As an alternative to the above this is the minimum uid to show
#MinimalUID=100
# If user or user.png exists in this dir it will be used as his picture
#GlobalFaceDir=@EXPANDED_DATADIR@/faces/
#GlobalFaceDir=@EXPANDED_DATADIR@/pixmaps/faces/
# File which contains the locale we show to the user. Likely you want to use
# the one shipped with gdm and edit it. It is not a standard locale.alias file,
# although gdm will be able to read a standard locale.alias file as well.
......
......@@ -650,17 +650,6 @@ EXPANDED_LIBDIR=`eval echo $LIBDIR_TMP`
AC_SUBST(EXPANDED_LIBDIR)
AC_DEFINE_UNQUOTED(EXPANDED_LIBDIR,"$EXPANDED_LIBDIR")
dnl This is where the binary actually resides,
dnl not the console helper link
if test "x$enable_console_helper" = "xyes"; then
GDMCONFIGDIR_TMP="$sbindir"
else
GDMCONFIGDIR_TMP="$bindir"
fi
EXPANDED_GDMCONFIGDIR=`eval echo $GDMCONFIGDIR_TMP`
AC_SUBST(EXPANDED_GDMCONFIGDIR)
AC_DEFINE_UNQUOTED(EXPANDED_GDMCONFIGDIR,"$EXPANDED_GDMCONFIGDIR")
LOCALEDIR_TMP="$sysconfdir/gdm"
EXPANDED_LOCALEDIR=`eval echo $LOCALEDIR_TMP`
AC_SUBST(EXPANDED_LOCALEDIR)
......@@ -869,6 +858,7 @@ AC_OUTPUT([
Makefile
daemon/Makefile
gui/Makefile
gui/faces/Makefile
gui/greeter/Makefile
gui/greeter/themes/Makefile
gui/greeter/themes/circles/Makefile
......@@ -899,7 +889,7 @@ docs/zh_HK/Makefile
docs/zh_TW/Makefile
config/gdm.conf
config/Xsession
config/Default
config/Init
config/PreSession
config/PostSession
daemon/gdm
......
......@@ -22,7 +22,7 @@ INCLUDES = \
# -DGNOME_DISABLE_DEPRECATED \
#
bin_PROGRAMS = gdm-binary
sbin_PROGRAMS = gdm-binary
gdm_binary_SOURCES = \
gdm.c \
......@@ -76,6 +76,6 @@ gdm_binary_LDADD = \
-L$(top_builddir)/vicious-extensions \
-lvicious
bin_SCRIPTS = gdm
sbin_SCRIPTS = gdm
EXTRA_DIST = gdm.in
......@@ -121,15 +121,15 @@ enum {
#define PIPE_SIZE 4096
/* Configuration constants */
#define GDM_KEY_CHOOSER "daemon/Chooser=" EXPANDED_BINDIR "/gdmchooser"
#define GDM_KEY_CHOOSER "daemon/Chooser=" EXPANDED_LIBEXECDIR "/gdmchooser"
/* This defaults to true for backward compatibility,
* it will not actually do automatic login since the AutomaticLogin defaults
* to nothing */
#define GDM_KEY_AUTOMATICLOGIN_ENABLE "daemon/AutomaticLoginEnable=true"
#define GDM_KEY_AUTOMATICLOGIN "daemon/AutomaticLogin="
#define GDM_KEY_ALWAYSRESTARTSERVER "daemon/AlwaysRestartServer=false"
#define GDM_KEY_GREETER "daemon/Greeter=" EXPANDED_BINDIR "/gdmlogin"
#define GDM_KEY_REMOTEGREETER "daemon/RemoteGreeter=" EXPANDED_BINDIR "/gdmlogin"
#define GDM_KEY_GREETER "daemon/Greeter=" EXPANDED_LIBEXECDIR "/gdmlogin"
#define GDM_KEY_REMOTEGREETER "daemon/RemoteGreeter=" EXPANDED_LIBEXECDIR "/gdmlogin"
#define GDM_KEY_ADD_GTK_MODULES "daemon/AddGtkModules=false"
#define GDM_KEY_GTK_MODULES_LIST "daemon/GtkModulesList="
#define GDM_KEY_GROUP "daemon/Group=gdm"
......@@ -227,12 +227,12 @@ enum {
#define GDM_KEY_EXCLUDE "greeter/Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm,nfsnobody,pcap"
#define GDM_KEY_MINIMALUID "greeter/MinimalUID=100"
#define GDM_KEY_FACE "greeter/DefaultFace=" EXPANDED_PIXMAPDIR "/nobody.png"
#define GDM_KEY_FACEDIR "greeter/GlobalFaceDir=" EXPANDED_DATADIR "/faces/"
#define GDM_KEY_FACEDIR "greeter/GlobalFaceDir=" EXPANDED_DATADIR "/pixmaps/faces/"
#define GDM_KEY_LOCFILE "greeter/LocaleFile=" EXPANDED_LOCALEDIR "/locale.alias"
#define GDM_KEY_LOGO "greeter/Logo=" EXPANDED_PIXMAPDIR "/gdm-foot-logo.png"
#define GDM_KEY_QUIVER "greeter/Quiver=true"
#define GDM_KEY_SYSMENU "greeter/SystemMenu=true"
#define GDM_KEY_CONFIGURATOR "daemon/Configurator=" EXPANDED_GDMCONFIGDIR "/gdmsetup --disable-sound --disable-crash-dialog"
#define GDM_KEY_CONFIGURATOR "daemon/Configurator=" EXPANDED_SBINDIR "/gdmsetup --disable-sound --disable-crash-dialog"
#define GDM_KEY_CONFIG_AVAILABLE "greeter/ConfigAvailable=true"
#define GDM_KEY_CHOOSER_BUTTON "greeter/ChooserButton=true"
#define GDM_KEY_TITLE_BAR "greeter/TitleBar=true"
......@@ -734,7 +734,8 @@ void gdm_final_cleanup (void);
#define GDM_SUP_GET_CONFIG "GET_CONFIG" /* <key> */
/* GET_CONFIG: Get configuration value for key. Useful so
* that other programs can request configuration information
* from GDM.
* from GDM. Any key defined as GDM_KEY_* in gdm.h is
* supported.
* Supported since: 2.6.0.9
* Arguments: <key>
* Answers:
......
......@@ -23,7 +23,5 @@ then
fi
fi
exec @EXPANDED_BINDIR@/gdm-binary "$@"
exec @EXPANDED_SBINDIR@/gdm-binary "$@"
# fallback, use PATH
exec gdm-binary "$@"
......@@ -1670,7 +1670,7 @@ run_config (GdmDisplay *display, struct passwd *pwent)
"default location."));
argv = ve_split
(EXPANDED_BINDIR
(EXPANDED_LIBEXECDIR
"/gdmsetup --disable-sound --disable-crash-dialog");
if (access (argv[0], X_OK) == 0)
VE_IGNORE_EINTR (execv (argv[0], argv));
......@@ -2624,11 +2624,11 @@ gdm_slave_greeter (void)
if (strstr (command, "gdmlogin") != NULL) {
/* in case it is gdmlogin that's crashing
try the graphical greeter for luck */
command = EXPANDED_BINDIR "/gdmgreeter";
command = EXPANDED_LIBEXECDIR "/gdmgreeter";
} else {
/* in all other cases, try the gdmlogin (standard greeter)
proggie */
command = EXPANDED_BINDIR "/gdmlogin";
command = EXPANDED_LIBEXECDIR "/gdmlogin";
}
}
......@@ -2649,13 +2649,13 @@ gdm_slave_greeter (void)
gdm_error (_("%s: Cannot start greeter trying default: %s"),
"gdm_slave_greeter",
EXPANDED_BINDIR "/gdmlogin");
EXPANDED_LIBEXECDIR "/gdmlogin");
ve_setenv ("GDM_WHACKED_GREETER_CONFIG", "true", TRUE);
exec_command (EXPANDED_BINDIR "/gdmlogin", NULL);
exec_command (EXPANDED_LIBEXECDIR "/gdmlogin", NULL);
VE_IGNORE_EINTR (execl (EXPANDED_BINDIR "/gdmlogin", EXPANDED_BINDIR "/gdmlogin", NULL));
VE_IGNORE_EINTR (execl (EXPANDED_LIBEXECDIR "/gdmlogin", EXPANDED_LIBEXECDIR "/gdmlogin", NULL));
gdm_error_box (d,
GTK_MESSAGE_ERROR,
......
......@@ -451,7 +451,7 @@
Optionally the greeter can provide a face browser containing icons for
all the users on a system. The icons can be installed globally by the
sysadmin or in the users' home directories. If installed globally
they should be in the <filename>&lt;share&gt;/faces/</filename>
they should be in the <filename>&lt;share&gt;/pixmaps/faces/</filename>
directory (though this can be configured with the
<filename>GlobalFaceDir</filename>
configuration option) and the filename should be the name of the user,
......@@ -2304,7 +2304,7 @@ XKeepsCrashing
<varlistentry>
<term>GlobalFaceDir</term>
<listitem>
<synopsis>GlobalFaceDir=&lt;share&gt;/faces/</synopsis>
<synopsis>GlobalFaceDir=&lt;share&gt;/pixmaps/faces/</synopsis>
<para>
Systemwide directory for face files. The sysadmin can place
icons for users here without touching their homedirs. Faces are
......@@ -3029,7 +3029,7 @@ Language=cs_CZ.UTF-8
<para>
Face images can also be placed in the global face directory, which is
normally <filename>&lt;share&gt;/faces/</filename>
normally <filename>&lt;share&gt;/pixmaps/faces/</filename>
(though this can be configured with the
<filename>GlobalFaceDir</filename> configuration option) and the
filename should be the name of the user, optionally with a
......@@ -3128,6 +3128,7 @@ FLEXI_XSERVER
FLEXI_XNEST
CONSOLE_SERVERS
ALL_SERVERS
GET_CONFIG
UPDATE_CONFIG
GREETERPIDS
QUERY_LOGOUT_ACTION
......@@ -3296,6 +3297,25 @@ Answers:
</screen>
</sect3>
<sect3 id="getconfig">
<title>GET_CONFIG</title>
<screen>
GET_CONFIG: Get configuration value for key. Useful so
that other programs can request configuration
information from GDM. Any key defined as GDM_KEY_*
in gdm.h is supported.
Supported since: 2.6.0.9
Arguments: &lt;key&gt;
Answers:
OK &lt;value&gt;
ERROR &lt;err number&gt; &lt;english error description&gt;
0 = Not implemented
50 = Unsupported key
200 = Too many messages
999 = Unknown error
</screen>
</sect3>
<sect3 id="updateconfig">
<title>UPDATE_CONFIG</title>
<screen>
......@@ -3498,185 +3518,14 @@ Supported since: 2.2.4.0
</sect2>
</sect1>
<sect1 id="binaries">
<title>GDM Commands</title>
<sect1 id="bindir_binaries">
<title>GDM Commands in EXPANDED_BINDIR</title>
<para>
The GDM package provides quite a few different commands.
The GDM package provides the following different commands in
EXPANDED_BINDIR intended to be used by the end-user:
</para>
<sect2 id="gdmcommandline">
<title><filename>gdm</filename> and <filename>gdm-binary</filename>
Command Line Options</title>
<para>
The <filename>gdm</filename> command is really just a script which
runs the <filename>gdm-binary</filename>, passing along any options.
Before launching gdm-binary, the gdm wrapper script will source the
<filename>/etc/profile</filename> file to set the standard system
environment variables. In order to better support
internationalization, it will also set the LC_MESSAGES environment
variable to LANG if neither LC_MESSAGES or LC_ALL are set. If you
really need to set some additional environment before launching GDM,
you can do so in this file.
</para>
<variablelist>
<title><filename>gdm</filename> and <filename>gdm-binary</filename>
Command Line Options</title>
<varlistentry>
<term>--help</term>
<listitem>
<para>
Gives a brief overview of the command line options.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-nodaemon</term>
<listitem>
<para>
If this option is specified, then gdm does not fork into the
background when run. You can use just a single dash with this
option to preserve compatibility with XDM.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>--no-console</term>
<listitem>
<para>
Tell the daemon that it should not run anything on the console.
This means that none of the local servers from the
<filename>[servers]</filename> section will be run, and the
console will not be used for communicating errors to the user.
An empty <filename>[servers]</filename> section automatically
implies this option.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>--preserve-ld-vars</term>
<listitem>
<para>
When clearing the environment internally, preserve all variables
starting with LD_. This is mostly for debugging purposes.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>--version</term>
<listitem>
<para>
Print the version of the GDM daemon.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>--wait-for-go</term>
<listitem>
<para>
If started with this option, gdm will init, but only start the
first local display and then wait for a GO message in the fifo
protocol. No greeter will be shown until the GO message is
sent. Also flexiserver requests will be denied and XDMCP will
not be started until GO is given. This is useful for
initialization scripts which wish to start X early, but where
you don't yet want the user to start logging in. So the script
would send the GO to the fifo once it is ready and GDM will
then continue. This functionality was added in version 2.5.90.0.
</para>
</listitem>
</varlistentry>
</variablelist>
</sect2>
<sect2 id="gdmgreeterlogincommandline">
<title><filename>gdmchooser</filename> and <filename>gdmlogin</filename>
Command Line Options</title>
<para>
The <filename>gdmgreeter</filename> and <filename>gdmlogin</filename>
are two different login programs, either can be used by GDM.
<filename>gdmgreeter</filename> is themeable with GDM themes while
<filename>gdmlogin</filename> is themable with GTK+ themes. These
programs are normally executed by the GDM daemon. Both programs
support standard GNOME options.
</para>
</sect2>
<sect2 id="gdmchoosercommandline">
<title><filename>gdmchooser</filename> Command Line Options</title>
<para>
The <filename>gdmchooser</filename> is the XDMCP chooser application.
The <filename>gdmchooser</filename> is normally executed by the GDM
daemon. It supports the following options for XDM compatibility.
This program supports standard GNOME options.
</para>
<variablelist>
<title><filename>gdmchooser</filename> Command Line Options</title>
<varlistentry>
<term>-xdmaddress=SOCKET</term>
<listitem>
<para>
Socket for XDM communication.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>--clientaddress=ADDRESS</term>
<listitem>
<para>
Client address to return in response to XDM. This option is for
running gdmchooser with XDM, and is not used within GDM.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-connectionType=TYPE</term>
<listitem>
<para>
Connection type to return in response to XDM. This option is for
running gdmchooser with XDM, and is not used within GDM.
</para>
</listitem>
</varlistentry>
</variablelist>
</sect2>
<sect2 id="gdmsetupcommandline">
<title><filename>gdmconfig</filename> and
<filename>gdmsetup</filename> Command Line Options</title>
<para>
<filename>gdmconfig</filename> is a wrapper script for running
<filename>gdmsetup</filename> for binary name compatibility.
<filename>gdmconfig</filename> is installed to the
<filename>&lt;sbin&gt;/</filename> directory.
</para>
<para>
gdmsetup runs a graphical program for modifying the GDM
configuration file, gdm.conf. Normally on systems that support the
PAM userhelper, this is setup such that when you run
<filename>gdmsetup</filename> as an ordinary user, it will first
ask you for your root password before starting. Otherwise, this
program may only be run as root. This program supports standard
GNOME options.
</para>
</sect2>
<sect2 id="gdmxnestchoosercommandline">
<title><filename>gdmXnestchooser</filename> and
<filename>gdmXnest</filename> Command Line Options</title>
......@@ -3695,20 +3544,8 @@ Supported since: 2.2.4.0
options.
</para>
<para>
<filename>gdmXnest</filename> is a symbolic link to
<filename>gdmXnestchooser</filename> and is the same as using the
--no-query and --no-gdm-check options with
<filename>gdmXnestchooser</filename>. It is useful for running
<filename>Xnest</filename> without actually connecting somewhere. It
will print out the display setting on standard output that you can use
to connect to this server. This is useful mostly for developers who
perhaps wish to test their apps running on a completely separate server.
</para>
<variablelist>
<title><filename>gdmXnestchooser</filename> and
<filename>gdmXnest</filename> Command Line Options</title>
<title><filename>gdmXnestchooser</filename> Command Line Options</title>
<varlistentry>
<term>-x, --xnest=STRING</term>
......@@ -3897,6 +3734,129 @@ remote-flexi - In remote (XDMCP) &amp; flexi mode.
</screen>
</para>
</sect2>
</sect1>
<sect1 id="sbindir_binaries">
<title>GDM Commands in EXPANDED_SBINDIR</title>
<para>
The GDM package provides the following different commands in
EXPANDED_SBINDIR intended to be used by the root user:
</para>
<sect2 id="gdmcommandline">
<title><filename>gdm</filename> and <filename>gdm-binary</filename>
Command Line Options</title>
<para>
The <filename>gdm</filename> command is really just a script which
runs the <filename>gdm-binary</filename>, passing along any options.
Before launching gdm-binary, the gdm wrapper script will source the
<filename>/etc/profile</filename> file to set the standard system
environment variables. In order to better support
internationalization, it will also set the LC_MESSAGES environment
variable to LANG if neither LC_MESSAGES or LC_ALL are set. If you
really need to set some additional environment before launching GDM,
you can do so in this script.
</para>
<variablelist>
<title><filename>gdm</filename> and <filename>gdm-binary</filename>
Command Line Options</title>
<varlistentry>
<term>--help</term>
<listitem>
<para>
Gives a brief overview of the command line options.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-nodaemon</term>
<listitem>
<para>
If this option is specified, then gdm does not fork into the
background when run. You can use just a single dash with this
option to preserve compatibility with XDM.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>--no-console</term>
<listitem>
<para>
Tell the daemon that it should not run anything on the console.
This means that none of the local servers from the
<filename>[servers]</filename> section will be run, and the
console will not be used for communicating errors to the user.
An empty <filename>[servers]</filename> section automatically
implies this option.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>--preserve-ld-vars</term>
<listitem>
<para>
When clearing the environment internally, preserve all variables
starting with LD_. This is mostly for debugging purposes.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>--version</term>
<listitem>
<para>
Print the version of the GDM daemon.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>--wait-for-go</term>
<listitem>
<para>
If started with this option, gdm will init, but only start the
first local display and then wait for a GO message in the fifo
protocol. No greeter will be shown until the GO message is
sent. Also flexiserver requests will be denied and XDMCP will
not be started until GO is given. This is useful for
initialization scripts which wish to start X early, but where
you don't yet want the user to start logging in. So the script
would send the GO to the fifo once it is ready and GDM will
then continue. This functionality was added in version 2.5.90.0.
</para>
</listitem>
</varlistentry>
</variablelist>
</sect2>
<sect2 id="gdmsetupcommandline">
<title><filename>gdmconfig</filename> and
<filename>gdmsetup</filename> Command Line Options</title>
<para>
<filename>gdmconfig</filename> is a wrapper script for running
<filename>gdmsetup</filename> for binary name compatibility.
<filename>gdmconfig</filename> is installed to the
<filename>&lt;sbin&gt;/</filename> directory.
</para>
<para>
gdmsetup runs a graphical program for modifying the GDM
configuration file, gdm.conf. Normally on systems that support the
PAM userhelper, this is setup such that when you run
<filename>gdmsetup</filename> as an ordinary user, it will first
ask you for your root password before starting. Otherwise, this
program may only be run as root. This program supports standard
GNOME options.
</para>
</sect2>
<sect2 id="gdmrestartcommandline">
<title><filename>gdm-restart</filename> Command Line Options</title>
......@@ -3905,8 +3865,6 @@ remote-flexi - In remote (XDMCP) &amp; flexi mode.
<filename>gdm-restart</filename> stops and restarts GDM by sending
the GDM daemon a HUP signal. This command will immediately terminate
all sessions and log out users currently logged in with GDM.
<filename>gdm-restart</filename> is installed to the
<filename>&lt;sbin&gt;/</filename> directory.
</para>
</sect2>
......@@ -3916,8 +3874,7 @@ remote-flexi - In remote (XDMCP) &amp; flexi mode.
<para>
<filename>gdm-safe-restart</filename> stops and restarts GDM by
sending the GDM daemon a USR1 signal. GDM will be restarted as soon
as all users log out. <filename>gdm-safe-restart</filename> is
installed to the <filename>&lt;sbin&gt;/</filename> directory.
as all users log out.
</para>
</sect2>
......@@ -3926,12 +3883,79 @@ remote-flexi - In remote (XDMCP) &amp; flexi mode.
<para>
<filename>gdm-stop</filename> stops GDM by sending the GDM daemon
a TERM signal. <filename>gdm-stop</filename> is installed to the
<filename>&lt;sbin&gt;/</filename> directory.
a TERM signal.
</para>
</sect2>
</sect1>
<sect1 id="sbindir_binaries">
<title>GDM Commands in EXPANDED_LIBEXECDIR</title>
<para>
The GDM package provides the following different commands in
EXPANDED_LIBEXECDIR intended to be used by the gdm daemon process.
</para>