Skip to content

Commit

Permalink
Remove gdm wrapper script
Browse files Browse the repository at this point in the history
This commit drops the gdm wrapper script, removing
one more instance of shell in boot up.

https://bugzilla.gnome.org/show_bug.cgi?id=683278
  • Loading branch information
elkrejzi authored and halfline committed Feb 5, 2013
1 parent 6fed512 commit b6c11aa
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 54 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ config.h.in
config.sub
configure
daemon/gdm
daemon/gdm-binary
daemon/gdm-factory-slave
daemon/gdm-session-worker
daemon/gdm-simple-slave
Expand Down
29 changes: 10 additions & 19 deletions daemon/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,10 @@ gdm_session_worker_LDADD = \
$(NULL)

sbin_PROGRAMS = \
gdm-binary \
gdm \
$(NULL)

gdm_binary_SOURCES = \
gdm_SOURCES = \
main.c \
gdm-display-access-file.c \
gdm-display-access-file.h \
Expand All @@ -327,7 +327,7 @@ gdm_binary_SOURCES = \
gdm-dbus-util.h \
$(NULL)

nodist_gdm_binary_SOURCES = \
nodist_gdm_SOURCES = \
gdm-display-glue.h \
gdm-display-glue.c \
gdm-local-display-factory-glue.h \
Expand Down Expand Up @@ -361,26 +361,26 @@ XDMCP_nodist_SOURCES = \
$(NULL)

if XDMCP_SUPPORT
gdm_binary_SOURCES += $(XDMCP_SOURCES)
nodist_gdm_binary_SOURCES += $(XDMCP_nodist_SOURCES)
gdm_SOURCES += $(XDMCP_SOURCES)
nodist_gdm_SOURCES += $(XDMCP_nodist_SOURCES)
endif

EXTRA_gdm_binary_SOURCES = \
EXTRA_gdm_SOURCES = \
$(XDMCP_SOURCES) \
$(NULL)

CONSOLE_KIT_SOURCES = \
$(NULL)

EXTRA_gdm_binary_SOURCES += $(CONSOLE_KIT_SOURCES)
EXTRA_gdm_SOURCES += $(CONSOLE_KIT_SOURCES)

# Note that these libs are in LDFLAGS because they should come before
# everything else on the link line as they may override stuff
gdm_binary_LDFLAGS = \
gdm_LDFLAGS = \
$(EXTRA_DAEMON_LIBS) \
$(NULL)

gdm_binary_LDADD = \
gdm_LDADD = \
$(top_builddir)/common/libgdmcommon.la \
$(XLIB_LIBS) \
$(DAEMON_LIBS) \
Expand All @@ -391,18 +391,10 @@ gdm_binary_LDADD = \
$(NULL)

if WITH_CONSOLE_KIT
gdm_binary_SOURCES += $(CONSOLE_KIT_SOURCES)
gdm_SOURCES += $(CONSOLE_KIT_SOURCES)
endif

sbin_SCRIPTS = \
gdm \
$(NULL)

gdm: $(srcdir)/gdm.in
sed -e 's,[@]sbindir[@],$(sbindir),g' <$(srcdir)/gdm.in >gdm

CLEANFILES = \
gdm \
gdm-display-glue.c \
gdm-local-display-factory-glue.c \
gdm-manager-glue.c \
Expand All @@ -418,7 +410,6 @@ CLEANFILES = \
$(NULL)

EXTRA_DIST = \
gdm.in \
gdm-manager.xml \
gdm-session-worker.xml \
gdm-session.xml \
Expand Down
21 changes: 0 additions & 21 deletions daemon/gdm.in

This file was deleted.

18 changes: 5 additions & 13 deletions docs/C/index.docbook
Original file line number Diff line number Diff line change
Expand Up @@ -2083,23 +2083,15 @@ Language=cs_CZ.UTF-8
</para>

<sect3 id="gdmcommandline">
<title><command>gdm</command> and <command>gdm-binary</command>
Command Line Options</title>
<title><command>gdm</command> Command Line Options</title>

<para>
The <command>gdm</command> command is really just a script which
runs the <command>gdm-binary</command>, passing along any options.
Before launching <command>gdm-binary</command>, the gdm wrapper
script will source the <filename>&lt;etc&gt;/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. The <command>gdm-binary</command> is the actual GDM daemon.
</para>
<command>gdm</command> is the main daemon which sets up
graphical login environment and starts necesary helpers.
</para>

<variablelist>
<title><command>gdm</command> and <command>gdm-binary</command>
Command Line Options</title>
<title><command>gdm</command> Command Line Options</title>

<varlistentry>
<term>-?, --help</term>
Expand Down

0 comments on commit b6c11aa

Please sign in to comment.