From 98c4ffd492b19495c5cd58d6106fd927bf68f638 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Fri, 2 Sep 2005 23:22:19 +0000
Subject: entrance: set DISPLAY before calling Xinit

---
 packages/e17/entrance/Xinit.d/99entrance    |  2 +-
 packages/e17/entrance/run-Xinit.patch       |  2 +-
 packages/e17/entrance/set-display-env.patch | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 packages/e17/entrance/set-display-env.patch

(limited to 'packages/e17/entrance')

diff --git a/packages/e17/entrance/Xinit.d/99entrance b/packages/e17/entrance/Xinit.d/99entrance
index 297cc909fe..e524443ec9 100644
--- a/packages/e17/entrance/Xinit.d/99entrance
+++ b/packages/e17/entrance/Xinit.d/99entrance
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-entrance
+exec entrance
 
diff --git a/packages/e17/entrance/run-Xinit.patch b/packages/e17/entrance/run-Xinit.patch
index 1d6c2307f7..52eaae3984 100644
--- a/packages/e17/entrance/run-Xinit.patch
+++ b/packages/e17/entrance/run-Xinit.patch
@@ -8,7 +8,7 @@
 +		chmod -x /etc/X11/Xinit.d/99gpe-login
 +fi
 +
-+/etc/X11/Xinit
++exec /etc/X11/Xinit
 +
  exec @prefix@/bin/entrance "$@"
  
diff --git a/packages/e17/entrance/set-display-env.patch b/packages/e17/entrance/set-display-env.patch
new file mode 100644
index 0000000000..37bfc1c2c8
--- /dev/null
+++ b/packages/e17/entrance/set-display-env.patch
@@ -0,0 +1,11 @@
+diff -Nur entrance~/src/daemon/spawner.c entrance/src/daemon/spawner.c
+--- entrance~/src/daemon/spawner.c	2005-09-02 14:00:29.000000000 -0700
++++ entrance/src/daemon/spawner.c	2005-09-02 15:53:31.000000000 -0700
+@@ -199,6 +199,7 @@
+       free(d->client.homedir);
+    d->client.homedir = NULL;
+ 
++   setenv("DISPLAY", d->name, 1);
+    snprintf(entrance_cmd, PATH_MAX, "%s -d %s", ENTRANCE, d->name);
+    if (d->config)
+       snprintf(entrance_cmd, PATH_MAX, "%s -d %s -c \"%s\" -z %d", 
-- 
cgit v1.2.3