[debian-edu-commits] debian-edu/ 17/31: * Change kdm console detection code to recognize any X display, not just :0.

[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 a2bcc2092ba40114a5c1faf88031382a19397541
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Jul 6 08:32:28 2008 +0000

      * Change kdm console detection code to recognize any X display, not
        just :0.
---
 debian/changelog                | 2 ++
 debian/patches/x-console.dpatch | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e90857a..fec271b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ killer (0.90-5) UNRELEASED; urgency=low
   * New patch linux-ps-longusernames to look up uids returned from ps to
     get the usernames, to work around the misfeature in ps only showing
     uids for users with usernames > 8 characters.
+  * Change kdm console detection code to recognize any X display, not
+    just :0.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun,  6 Jul 2008 01:23:22 +0200
 
diff --git a/debian/patches/x-console.dpatch b/debian/patches/x-console.dpatch
index baccdd4..21e4f44 100644
--- a/debian/patches/x-console.dpatch
+++ b/debian/patches/x-console.dpatch
@@ -25,7 +25,7 @@ gdmuser tty7         2008-02-14 20:21 (:0)
 -	}
 -	$self->initializeTty($parts[1], stat("/dev/" . $parts[1]));
 +    if ( $parts[1] eq 'console'
-+         || $parts[1] eq ':0'        # kdm
++         || $parts[1] =~ '^:\d+$'    # kdm
 +         || $parts[1] =~ '^tty\d$'   # gdm
 +       ) {
 +         $consoleuser = $parts[0];

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