Enlightenment CVS committal
Author : atmosphere
Project : misc
Module : elogin
Dir : misc/elogin/src/daemon
Modified Files:
Makefile.am spawner.c spawner.h
Log Message:
JeopardE rules, thanks dude
this is handling everything much much nicer spawner wise.
it now sources your /etc/profile so your environment is right for users as
well
===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/daemon/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 6 May 2002 17:56:07 -0000 1.1
+++ Makefile.am 18 Jan 2003 04:02:46 -0000 1.2
@@ -7,6 +7,7 @@
@ecore_cflags@
sbin_PROGRAMS = elogind
+bin_SCRIPTS = elogin_wrapper
elogind_SOURCES = \
spawner.c spawner.h
===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/daemon/spawner.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- spawner.c 14 Jan 2003 18:46:50 -0000 1.9
+++ spawner.c 18 Jan 2003 04:02:46 -0000 1.10
@@ -125,6 +125,7 @@
/* register child signal handler */
signal(SIGCHLD, elogin_exit);
signal(SIGHUP, elogin_exit);
+ signal(SIGTERM, elogin_exit);
/* setup a spawner context */
d = spawner_display_new();
@@ -200,6 +201,14 @@
int x_status = 0;
pid_t pid;
+ if (signum == SIGTERM)
+ {
+ kill(d->pid.client, SIGTERM);
+ sleep(2);
+ kill(d->pid.x, SIGTERM);
+ exit(0);
+ }
+
while ((pid = waitpid(-1, &status, 0)) > 0)
{
if (pid == d->pid.client)
@@ -218,6 +227,7 @@
}
else
{
+ kill(d->pid.x, SIGKILL);
d->display = NULL;
spawn_x();
spawn_elogin();
===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/daemon/spawner.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- spawner.h 13 Jan 2003 21:43:14 -0000 1.6
+++ spawner.h 18 Jan 2003 04:02:47 -0000 1.7
@@ -13,11 +13,8 @@
#define X_SERVER "/usr/X11R6/bin/X -terminate -ac -quiet"
/* #define X_SERVER "/usr/X11R6/bin/Xnest -terminate -geometry 640x480 -ac -full :1"
*/
-#define X_DISP ":0" /* only used if DISPLAY variable is NOT set */
-#define ELOGIN "/usr/local/bin/elogin" /* FIXME
- PACKAGE_PREFIX
- or
- somethin */
+#define X_DISP ":0" /* only used if DISPLAY variable is NOT set */
+#define ELOGIN PREFIX "/bin/elogin_wrapper"
#define PIDFILE "/var/run/elogind.pid"
/* display->status possible values */
-------------------------------------------------------
This SF.NET email is sponsored by: Thawte.com - A 128-bit supercerts will
allow you to extend the highest allowed 128 bit encryption to all your
clients even if they use browsers that are limited to 40 bit encryption.
Get a guide here:http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0030en
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
