[debian-edu-commits] debian-edu/ 05/31: debian/patches/x-console.dpatch modified to avoid killing the user logged via gdm/kdm

[Alexander Alemayhu]

This is an automated email from the git hooks/post-receive script.

ccscanf-guest pushed a commit to branch master
in repository killer.

commit dc1a68f40a80efd4c94993fbeeb15f27a1a41c0a
Author: José L. Redrejo Rodríguez <jredrejo at edu.juntaextremadura.net>
Date:   Tue Feb 26 09:25:51 2008 +0000

    debian/patches/x-console.dpatch modified to avoid killing the user logged via gdm/kdm
---
 debian/changelog                |  2 ++
 debian/patches/x-console.dpatch | 26 ++++++++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c8021cf..7187f66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ killer (0.90-3) UNRELEASED; urgency=low
     root at .
   * Make package group maintained by Debian Edu and add
     José L. Redrejo Rodríguez as uploader.
+  * debian/patches/x-console.dpatch modified to avoid killing the user
+    logged via gdm/kdm
   * Add Vcs-Svn and Vcs-Browse headers to the control file.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 20 Feb 2008 09:42:03 +0100
diff --git a/debian/patches/x-console.dpatch b/debian/patches/x-console.dpatch
index 7b932d5..030ec44 100644
--- a/debian/patches/x-console.dpatch
+++ b/debian/patches/x-console.dpatch
@@ -1,6 +1,7 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 
 Detect kdm and gdm logins as console users.
+In that case jump over the initializeTty routine.
 This is example output from who in this case:
 
 % who
@@ -11,19 +12,28 @@ kdmuser :0           2008-01-22 15:58
 gdmuser tty7         2008-02-14 20:21 (:0)
 %
 
+
 @DPATCH@
-diff -urNad killer-0.90~/killer killer-0.90/killer
---- killer-0.90~/killer	2008-02-16 12:00:47.000000000 +0100
-+++ killer-0.90/killer	2008-02-16 12:01:45.000000000 +0100
-@@ -876,7 +876,10 @@
-     while ( <W> ) {
+
+--- killer-0.90~/killer	2008-02-26 10:19:41.000000000 +0100
++++ killer-0.90/killer	2008-02-26 10:19:07.000000000 +0100
+@@ -877,9 +877,17 @@
  	chop;
  	@parts = split(/[ \t]+/);
--	if ( $parts[1] eq 'console' ) {
+ 	if ( $parts[1] eq 'console' ) {
 +	if ( $parts[1] eq 'console'
 +	     || $parts[1] eq ':0'        # kdm
 +	     || $parts[1] =~ '^tty\d$'   # gdm
 +           ) { 
  	    $consoleuser = $parts[0];
- 	}
- 	$self->initializeTty($parts[1], stat("/dev/" . $parts[1]));
+-	}
+-	$self->initializeTty($parts[1], stat("/dev/" . $parts[1]));
++	    $tty2idletime{$parts[1]}=0;
++        push (@{$user2ttys{$consoleuser}},  $parts[1]);
++        } else {
++        $self->initializeTty($parts[1], stat("/dev/" . $parts[1]));
++		}
++
+     }
+     close(W);
+ }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/killer.git