do not create a process group with setsid

So that we can kill the whole task when started with fork_worker().

diff --git a/Makefile b/Makefile
index 0d881fea3af81ae3ada165951eb9aca975613c1e..72514b5ac889747016711549064a3bfd187023ec 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 PACKAGE=vncterm
 VERSION=1.0
 
 PACKAGE=vncterm
 VERSION=1.0

-PACKAGERELEASE=1
+PACKAGERELEASE=2

 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 CDATE:=$(shell date +%F)
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 CDATE:=$(shell date +%F)
 

diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index e0d10676d06f04aa07bb4f6eda7bf7078ce10927..248d8cbbfbe7c1fd8f9db2c64e2d8474d266bc3f 100644 (file)
--- 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 <support@proxmox.com>  Tue, 13 Sep 2011 10:49:32 +0200
+

 vncterm (1.0-1) unstable; urgency=low
 
   * use TigerVNC java sources
 vncterm (1.0-1) unstable; urgency=low
 
   * use TigerVNC java sources

diff --git a/debian/control b/debian/control
index 5f4f7dffac08fdabc1f17b2a984cca716dd179b8..76582be520a69790d7c5f7c55659f81596f5dc95 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: vncterm
 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
 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 1ac0e3e0c3fcc61dfb5f4c7fb6d0392090e79e1e..ec5394b6ec3d5f4349c24b35a23382abf662752c 100644 (file)
--- 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;
 
   dimensions.ws_col = vt->width;
   dimensions.ws_row = vt->height;
 

-  setsid ();
-

   setenv ("TERM", TERM, 1);
 
   pid = forkpty (&master, ptyname, NULL, &dimensions);
   setenv ("TERM", TERM, 1);
 
   pid = forkpty (&master, ptyname, NULL, &dimensions);