diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | daemon/gdm.c | 10 | ||||
| -rw-r--r-- | docs/C/gdm.xml | 19 |
3 files changed, 25 insertions, 11 deletions
@@ -1,3 +1,10 @@ +2006-05-24 Brian Cameron <brian.cameron@sun.com> + + * daemon/gdm.c, docs/C/gdm.xml: Put back support for -nodaemon + argument, lost in the 5-12 patch by Christian Kirbach. This + fixes bug #324831. Patch provided by Ray Strode + <rstrode@redhat.com>. + 2006-05-23 Brian Cameron <brian.cameron@sun.com> * NEWS: Add 2.14.7 info. diff --git a/daemon/gdm.c b/daemon/gdm.c index f0cc0f88..4b15e01e 100644 --- a/daemon/gdm.c +++ b/daemon/gdm.c @@ -1378,6 +1378,7 @@ main (int argc, char *argv[]) GOptionContext *ctx; gchar *pidfile; const char *charset; + int i; /* semi init pseudorandomness */ gdm_random_tick (); @@ -1403,6 +1404,15 @@ main (int argc, char *argv[]) ctx = g_option_context_new (_("- The GNOME login manager")); g_option_context_add_main_entries (ctx, options, _("main options")); + + /* preprocess the arguments to support the xdm style -nodaemon + * option + */ + for (i = 0; i < argc; i++) { + if (strcmp (argv[i], "-nodaemon") == 0) + argv[i] = (char *) "--nodaemon"; + } + g_option_context_parse (ctx, &argc, &argv, NULL); g_option_context_free (ctx); diff --git a/docs/C/gdm.xml b/docs/C/gdm.xml index 43d0c3fc..0350e7a6 100644 --- a/docs/C/gdm.xml +++ b/docs/C/gdm.xml @@ -184,15 +184,11 @@ </para> <para> - As of the GDM 2.15 development series one-dash arguments are no - longer supported. This includes the "-nodaemon" argument - used by <command>gdm</command> and <command>gdm-binary</command>. It - also includes the "-xdmaddress", "-clientaddress", - and "-connectionType" arguments used by - <command>gdmchooser</command>. These arguments have been changed to - now use two dashes. GDM previously supported the one-dash arguments to - be more similar with the XDM login manager, but one-dash command line - arguments is deprecated in the GNOME stack. + As of the GDM 2.15 development series, some one-dash arguments are no + longer supported. This includes the "-xdmaddress", + "-clientaddress", and "-connectionType" arguments + used by <command>gdmchooser</command>. These arguments have been + changed to now use two dashes. </para> <para> @@ -5331,8 +5327,9 @@ remote-flexi - In remote (XDMCP) & flexi mode. <listitem> <para> If this option is specified, then GDM does not fork into the - background when run. Note that you cannot use the single-dash - option any more that e.g. XDM understands. + background when run. You can also use a single-dash version, + "-nodaemon" for compatibility with other display + managers. </para> </listitem> </varlistentry> |