]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/e17/entrance/Xserver.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / e17 / entrance / Xserver.patch
1 --- entrance/src/daemon/Entranced.h.~1.7.~      2004-05-19 21:02:09.000000000 -0700
2 +++ entrance/src/daemon/Entranced.h     2005-08-13 02:00:02.000000000 -0700
3 @@ -18,7 +18,7 @@
4  
5  #define ENTRANCED_DEBUG 1
6  
7 -#define X_SERVER "/usr/X11R6/bin/X -quiet"
8 +#define X_SERVER "/etc/X11/Xserver"
9  //#define X_SERVER "/usr/X11R6/bin/Xnest -full"
10  #define X_DISP ":0"             /* only used if DISPLAY variable is NOT set */
11  #define ENTRANCE PREFIX "/bin/entrance_wrapper"
12 --- entrance/src/daemon/spawner.c.~1.25.~       2005-05-28 02:31:14.000000000 -0700
13 +++ entrance/src/daemon/spawner.c       2005-08-13 02:20:13.000000000 -0700
14 @@ -155,7 +155,7 @@
15          sigaction(SIGUSR1, &_entrance_x_sa, NULL);
16        /* FIXME: need to parse command and NOT go thru /bin/sh!!!! */
17        /* why? some /bin/sh's wont pass on this SIGUSR1 thing... */
18 -        execl("/bin/sh", "/bin/sh", "-c", x_cmd, NULL);
19 +        execl("/bin/bash", "/bin/bash", "-c", x_cmd, NULL);
20          syslog(LOG_WARNING, "Could not execute X server.");
21          exit(1);
22       default: