X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_bin%2Fgrml-lock;h=0e04959589bd33b9fd69fefb36f4293f4d3e046f;hb=refs%2Ftags%2Fv1.1.25;hp=f3011e4bd298d416ebb13d9a7ab1600050619278;hpb=18da758103e1fa374a8daa9e6e76f43bb1a00da6;p=grml-scripts.git

diff --git a/usr_bin/grml-lock b/usr_bin/grml-lock
index f3011e4..0e04959 100755
--- a/usr_bin/grml-lock
+++ b/usr_bin/grml-lock
@@ -4,14 +4,17 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Son Mai 06 15:52:16 CEST 2007 [mika]
 ################################################################################
 
-PN=$0
+PN="$0"
 
 if [ -r /etc/grml/script-functions ] ; then
    . /etc/grml/script-functions
-   check4progs vlock xlock sudo chpasswd dialog || { echo "Sorry, can't continue. Exiting.">&2 ; exit 1 }
+   if [ -x /usr/bin/X ] ; then
+      check4progs vlock xlock sudo chpasswd dialog || { echo "Sorry, can't continue. Exiting.">&2 ; exit 1 }
+   else
+      check4progs vlock sudo chpasswd dialog || { echo "Sorry, can't continue. Exiting.">&2 ; exit 1 }
+   fi
 fi
 
 if [ -r /etc/grml_version ] ; then
@@ -96,14 +99,18 @@ case $retval in
 esac
 }
 
-if [[ $(tty) == /dev/tty* ]] ; then
-  welcome_screen
-  askpwd
-  askvlock
-elif [ -n "$DISPLAY" ] ; then
-  welcome_screen
-  askpwd
-  askxlock
+if ! isgrmlcd ; then
+   [[ $(tty) == /dev/tty* ]] && lockcons || lockx
+else
+   if [[ $(tty) == /dev/tty* ]] ; then
+     welcome_screen
+     askpwd
+     askvlock
+   elif [ -n "$DISPLAY" ] ; then
+     welcome_screen
+     askpwd
+     askxlock
+   fi
 fi
 
 ## END OF FILE #################################################################