projects
/
grml-scripts-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f7085d5
)
Require xlock in grml-lock if DISPLAY is set. [Closes: issue768]
author
Ulrich Dangel
<uli@spamt.net>
Fri, 6 Nov 2009 18:19:28 +0000
(19:19 +0100)
committer
Ulrich Dangel
<uli@spamt.net>
Fri, 6 Nov 2009 18:22:12 +0000
(19:22 +0100)
usr_bin/grml-lock
patch
|
blob
|
history
diff --git
a/usr_bin/grml-lock
b/usr_bin/grml-lock
index
0e04959
..
a46d681
100755
(executable)
--- 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 [ -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 }
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
fi
fi