From c9e46b9a7d167336b77c73c102eb6eb1c25b141c Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 13 Sep 2011 10:50:37 +0200 Subject: [PATCH] do not create a process group with setsid So that we can kill the whole task when started with fork_worker(). --- Makefile | 2 +- debian/changelog.Debian | 7 +++++++ debian/control | 2 +- vncterm.c | 2 -- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0d881fe..72514b5 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ RELEASE=2.0 PACKAGE=vncterm VERSION=1.0 -PACKAGERELEASE=1 +PACKAGERELEASE=2 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) CDATE:=$(shell date +%F) diff --git a/debian/changelog.Debian b/debian/changelog.Debian index e0d1067..248d8cb 100644 --- a/debian/changelog.Debian +++ b/debian/changelog.Debian @@ -1,3 +1,10 @@ +vncterm (1.0-2) unstable; urgency=low + + * do not create a new process group (with setsid), so + we can kill the whole pve task if used inside fork_worker(). + + -- Proxmox Support Team Tue, 13 Sep 2011 10:49:32 +0200 + vncterm (1.0-1) unstable; urgency=low * use TigerVNC java sources diff --git a/debian/control b/debian/control index 5f4f7df..76582be 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Package: vncterm -Version: 1.0-1 +Version: 1.0-2 Section: x11 Priority: optional Depends: libc6 (>= 2.7-18), libjpeg62, zlib1g (>= 1:1.2.1), libvncserver0 diff --git a/vncterm.c b/vncterm.c index 1ac0e3e..ec5394b 100644 --- a/vncterm.c +++ b/vncterm.c @@ -2358,8 +2358,6 @@ main (int argc, char** argv) dimensions.ws_col = vt->width; dimensions.ws_row = vt->height; - setsid (); - setenv ("TERM", TERM, 1); pid = forkpty (&master, ptyname, NULL, &dimensions); -- 2.39.2