From db8bf7a6603507d5b9664d1c631c89a828279748 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Mon, 4 Jun 2007 22:50:26 +0200
Subject: [PATCH] grml-lock: support fast execution on hd-install [Closes:
 issue220]

---
 debian/changelog  |  1 +
 usr_bin/grml-lock | 28 ++++++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 304622e..90b5382 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 grml-scripts (1.0.3) unstable; urgency=low
 
   * grml-lang: support dvorak keyboard layout
+  * grml-lock: support fast execution on hd-install [Closes: issue220]
 
  -- Michael Prokop <mika@grml.org>  Mon, 04 Jun 2007 22:33:36 +0200
 
diff --git a/usr_bin/grml-lock b/usr_bin/grml-lock
index 82dca79..6b0bf59 100755
--- a/usr_bin/grml-lock
+++ b/usr_bin/grml-lock
@@ -4,17 +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]
+# Latest change: Mon Jun 04 22:49:37 CEST 2007 [mika]
 ################################################################################
 
-PN=$0
+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 }
+      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 }
+      check4progs vlock sudo chpasswd dialog || { echo "Sorry, can't continue. Exiting.">&2 ; exit 1 }
    fi
 fi
 
@@ -100,14 +100,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 #################################################################
-- 
2.1.4