GNOME.org
 

Re: gdm2 string freeze breakage


Release Team:

Apologies for the string freeze breakage in the gdm2 HEAD branch.  
As you probably know, I received the announcement of this breakage
earlier today (see 1st attachment for reference). 

I've also attached the patch that was committed for reference.  
George Lebl did approve the patch before I submitted it.  We both
obviously missed the fact that the new string was being added.  
Anyway, you will notice that the string that was added is in
misc.c.  It is the following line:

+		gdm_error (_("Can not start fallback console"));

Note that this message only appears if FBCONSOLE is present on 
the system.  In other words, this message will only possibly appear
on Solaris machines using gdm2.  Also note that this message only
will appear if there is a problem starting the fbconsole program,
which should never happen.  If this message were to appear, then
this would mean that something is seriously wrong with Solaris,
and the user will probably be seeing a lot of other errors as well.

Therefore, I do not think that it is important to translate this
particular message for this release.  Also, I could take out the
error message for now, and add it back later, when the 2.4
release has been finished.

So, please let me know what the best course of action for this
particular message should be.  As I said, I am happy to take out
the error message if that is deemed to be the best approach.

Brian


There has been an unannounced string freeze breakage in the gdm2 HEAD
branch.

This seems to be the commit in daemon/server.c that caused the
unannounced string addition:

----------------------------
1.99 <bcameron> 2003-08-13 04:59
* acconfig.h, configure.in: add check for fbconsole (fallback
(console)
* daemon/server.c: add call to start fbconsole (if present)
after the Xserver starts.
----------------------------

This is the change:
http://cvs.gnome.org/bonsai/cvsview2.cgi?diff_mode=context&whitespace_mode=show&root=/cvs/gnome&subdir=gdm2/daemon&command=DIFF_FRAMESET&file=server.c&rev2=1.99&rev1=1.98

Communication with translators regarding string changes at supposedly
frozen times is very important. The string freeze is not new anymore and
we (gnome-i18n@gnome.org) and the release team (release-team@gnome.org)
more than ever need to know about, and approve, proposed changes and
additions in internationalized strings, as outlined in
http://developer.gnome.org/dotplan/tasks.html#ApprovingFreezeBreaks.
Thanks.


Christian



Index: gdm2/acconfig.h
===================================================================
RCS file: /cvs/gnome/gdm2/acconfig.h,v
retrieving revision 1.18
diff -u -p -r1.18 acconfig.h
--- gdm2/acconfig.h	28 Jul 2003 17:39:02 -0000	1.18
+++ gdm2/acconfig.h	12 Aug 2003 17:21:19 -0000
@@ -4,6 +4,7 @@
 #undef ENABLE_NLS
 #undef HAVE_CATGETS
 #undef HAVE_DEFOPEN
+#undef HAVE_FBCONSOLE
 #undef HAVE_GETTEXT
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY
Index: gdm2/configure.in
===================================================================
RCS file: /cvs/gnome/gdm2/configure.in,v
retrieving revision 1.196
diff -u -p -r1.196 configure.in
--- gdm2/configure.in	8 Aug 2003 01:04:36 -0000	1.196
+++ gdm2/configure.in	12 Aug 2003 17:21:19 -0000
@@ -225,7 +225,7 @@ if test x$have_pam = xno; then
 	AC_DEFINE(HAVE_SHADOW)
   elif test x$enable_authentication_scheme != xcrypt ; then
   	# Check for shadow passwords (hack)
-  	AC_MSG_CHECKING("for /etc/shadow")
+  	AC_MSG_CHECKING(for /etc/shadow)
 
   	if test -f /etc/shadow; then
 		VRFY="verify-shadow"
@@ -503,6 +503,14 @@ LOGDIR_TMP="$localstatedir/log/gdm"
 EXPANDED_LOGDIR=`eval echo $LOGDIR_TMP`
 AC_SUBST(EXPANDED_LOGDIR)
 AC_DEFINE_UNQUOTED(EXPANDED_LOGDIR,"$EXPANDED_LOGDIR")
+
+AC_MSG_CHECKING(for fbconsole)
+if test -x /usr/openwin/bin/fbconsole; then
+   AC_DEFINE(HAVE_FBCONSOLE)
+   AC_MSG_RESULT(yes)
+else
+   AC_MSG_RESULT(no)
+fi
 
 if test -x /usr/X11R6/bin/X; then
    X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
Index: gdm2/daemon/misc.c
===================================================================
RCS file: /cvs/gnome/gdm2/daemon/misc.c,v
retrieving revision 1.81
diff -u -p -r1.81 misc.c
--- gdm2/daemon/misc.c	4 Aug 2003 20:47:44 -0000	1.81
+++ gdm2/daemon/misc.c	12 Aug 2003 17:21:19 -0000
@@ -635,6 +635,31 @@ gdm_exec_wait (char * const *argv, gbool
 		return -1;
 }
 
+#ifdef HAVE_FBCONSOLE
+#define FBCONSOLE "/usr/openwin/bin/fbconsole"
+
+void
+gdm_exec_fbconsole(GdmDisplay *disp)
+{
+	pid_t pid;
+	char *argv[6];
+		
+	argv[0] = FBCONSOLE;
+	argv[1] = "-d";
+	argv[2] = disp->name;
+	argv[3] = NULL;
+
+	pid = fork ();
+	if (pid == 0) {
+		gdm_close_all_descriptors (0 /* from */, -1 /* except */, -1 /* except2 */);
+		IGNORE_EINTR (execv (argv[0], argv));
+ 	}
+        if (pid == -1) {
+		gdm_error (_("Can not start fallback console"));
+	}
+}
+#endif
+
 static int sigchld_blocked = 0;
 static sigset_t sigchldblock_mask, sigchldblock_oldmask;
 
Index: gdm2/daemon/misc.h
===================================================================
RCS file: /cvs/gnome/gdm2/daemon/misc.h,v
retrieving revision 1.39
diff -u -p -r1.39 misc.h
--- gdm2/daemon/misc.h	1 Aug 2003 18:17:58 -0000	1.39
+++ gdm2/daemon/misc.h	12 Aug 2003 17:21:19 -0000
@@ -47,6 +47,10 @@ gboolean gdm_text_yesno_dialog (const ch
 int	gdm_exec_wait (char * const *argv, gboolean no_display,
 		       gboolean de_setuid);
 
+#ifdef HAVE_FBCONSOLE
+void	gdm_exec_fbconsole(GdmDisplay *disp);
+#endif
+
 /* done before each login.  This can do so sanity ensuring,
  * one of the things it does now is make sure /tmp/.ICE-unix
  * exists and has the correct permissions */
Index: gdm2/daemon/server.c
===================================================================
RCS file: /cvs/gnome/gdm2/daemon/server.c,v
retrieving revision 1.98
diff -u -p -r1.98 server.c
--- gdm2/daemon/server.c	29 Jul 2003 19:18:22 -0000	1.98
+++ gdm2/daemon/server.c	12 Aug 2003 17:21:19 -0000
@@ -215,10 +215,14 @@ gdm_server_reinit (GdmDisplay *disp)
 	/* Wait for the SIGUSR1 */
 	do_server_wait (d);
 
-	if (d->servstat == SERVER_RUNNING)
+	if (d->servstat == SERVER_RUNNING) {
+#ifdef HAVE_FBCONSOLE
+		gdm_exec_fbconsole(d);
+#endif
 		return TRUE;
-	else
+        } else {
 		return FALSE;
+	}
 }
 
 /**
@@ -686,6 +690,10 @@ gdm_server_start (GdmDisplay *disp, gboo
 		    if (d->vt >= 0)
 			    gdm_slave_send_num (GDM_SOP_VT_NUM, d->vt);
 	    }
+
+#ifdef HAVE_FBCONSOLE
+            gdm_exec_fbconsole(d);
+#endif
 
 	    return TRUE;
     default:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]