diff options
| author | Justin Patrin <papercrane@gmail.com> | 2005-08-13 10:23:11 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-13 10:23:11 +0000 |
| commit | 344ce87c05155c4fff8b2091b78552b8213b951d (patch) | |
| tree | 391fd2d93f0deb46650ba4ac1a01053ce251f85e /packages/e17/entrance/Xserver.patch | |
| parent | 4dd4a258f7414b4b883d34e964700f55b46a3103 (diff) | |
Add patches and configuration to make entrance(d) actually work
Diffstat (limited to 'packages/e17/entrance/Xserver.patch')
| -rw-r--r-- | packages/e17/entrance/Xserver.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/packages/e17/entrance/Xserver.patch b/packages/e17/entrance/Xserver.patch new file mode 100644 index 0000000000..296a7bccf4 --- /dev/null +++ b/packages/e17/entrance/Xserver.patch @@ -0,0 +1,22 @@ +--- entrance/src/daemon/Entranced.h.~1.7.~ 2004-05-19 21:02:09.000000000 -0700 ++++ entrance/src/daemon/Entranced.h 2005-08-13 02:00:02.000000000 -0700 +@@ -18,7 +18,7 @@ + + #define ENTRANCED_DEBUG 1 + +-#define X_SERVER "/usr/X11R6/bin/X -quiet" ++#define X_SERVER "/etc/X11/Xserver" + //#define X_SERVER "/usr/X11R6/bin/Xnest -full" + #define X_DISP ":0" /* only used if DISPLAY variable is NOT set */ + #define ENTRANCE PREFIX "/bin/entrance_wrapper" +--- entrance/src/daemon/spawner.c.~1.25.~ 2005-05-28 02:31:14.000000000 -0700 ++++ entrance/src/daemon/spawner.c 2005-08-13 02:20:13.000000000 -0700 +@@ -155,7 +155,7 @@ + sigaction(SIGUSR1, &_entrance_x_sa, NULL); + /* FIXME: need to parse command and NOT go thru /bin/sh!!!! */ + /* why? some /bin/sh's wont pass on this SIGUSR1 thing... */ +- execl("/bin/sh", "/bin/sh", "-c", x_cmd, NULL); ++ execl("/bin/bash", "/bin/bash", "-c", x_cmd, NULL); + syslog(LOG_WARNING, "Could not execute X server."); + exit(1); + default: |