From c4004ce5be013ef7ab40d1c82212043236a10d6a Mon Sep 17 00:00:00 2001
From: Ulrich Dangel <uli@spamt.net>
Date: Fri, 6 Nov 2009 19:19:28 +0100
Subject: [PATCH] Require xlock in grml-lock if DISPLAY is set. [Closes:
 issue768]

---
 usr_bin/grml-lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr_bin/grml-lock b/usr_bin/grml-lock
index 0e04959..a46d681 100755
--- a/usr_bin/grml-lock
+++ b/usr_bin/grml-lock
@@ -10,10 +10,10 @@ PN="$0"
 
 if [ -r /etc/grml/script-functions ] ; then
    . /etc/grml/script-functions
-   if [ -x /usr/bin/X ] ; then
-      check4progs vlock xlock sudo chpasswd dialog || { echo "Sorry, can't continue. Exiting.">&2 ; exit 1 }
-   else
+   if [ -z "$DISPLAY" ] ; then
       check4progs vlock sudo chpasswd dialog || { echo "Sorry, can't continue. Exiting.">&2 ; exit 1 }
+  else
+      check4progs xlock sudo chpasswd dialog || { echo "Sorry, can't continue. Exiting.">&2 ; exit 1 }
    fi
 fi
 
-- 
2.1.4