[pkg-fso-commits] [SCM] Automatic Display Manager branch, master, updated. debian/0.8-1-22-g5417138

[Enrico Zini]

The following commit has been merged in the master branch:
commit 5417138290565838f6b10965709642b1e6ffc0e5
Author: Enrico Zini <enrico at enricozini.org>
Date:   Tue Jul 19 23:38:55 2011 +0200

    default X start timeout increased to 30 seconds. Closes: #633089; X start timeout configurable via NODM_X_TIMEOUT

diff --git a/README b/README
index 85a3c74..ba62624 100644
--- a/README
+++ b/README
@@ -84,3 +84,7 @@ NODM_XSESSION
 NODM_XINIT
   Was used by older versions of nodm as the path to the xinit program, but it
   is now ignored.
+
+NODM_X_TIMEOUT
+  Timeout (in seconds) to wait for X to be ready to accept connections. If X is
+  not ready before this timeout, it is killed and restarted.
diff --git a/configure.ac b/configure.ac
index b31bf33..e9f9acb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(nodm, 0.9, [enrico at enricozini.org, nomeata at debian.org])
+AC_INIT(nodm, 0.10, [enrico at enricozini.org, nomeata at debian.org])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([-Wall std-options foreign])
diff --git a/debian/changelog b/debian/changelog
index 0a4d106..d3b6dff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nodm (0.10-1) unstable; urgency=low
+
+  * New upstream version
+     - default X start timeout increased to 30 seconds. Closes: #633089
+     - X start timeout configurable via NODM_X_TIMEOUT
+
+ -- Enrico Zini <enrico at debian.org>  Tue, 19 Jul 2011 23:35:24 +0200
+
 nodm (0.9-1) unstable; urgency=low
 
   * Keep a connection to the server open during its whole lifetime, to avoid
diff --git a/xserver.c b/xserver.c
index 4926b63..455db2f 100644
--- a/xserver.c
+++ b/xserver.c
@@ -72,7 +72,8 @@ static void on_sigchld(int sig) {}
 
 void nodm_xserver_init(struct nodm_xserver* srv)
 {
-    srv->conf_timeout = 5;
+    // Get the user we should run the session for
+    srv->conf_timeout = atoi(getenv_with_default("NODM_X_TIMEOUT", "30"));
     srv->argv = 0;
     srv->name = 0;
     srv->pid = -1;

-- 
Automatic Display Manager