From: Michael Prokop <mika@grml.org>
Date: Wed, 8 Jul 2015 13:17:21 +0000 (+0200)
Subject: grml-lock: switch from vlock to physlock [Closes: issue1342]
X-Git-Tag: v2.6.0~3
X-Git-Url: http://git.grml.org/?p=grml-scripts.git;a=commitdiff_plain;h=efc668569ca3e23a6594307ededdd7e8933988ec

grml-lock: switch from vlock to physlock [Closes: issue1342]

Add physlock package to Recommends.
---

diff --git a/debian/control b/debian/control
index 248be15..41770fd 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Bugs: mailto:bugs@grml.org
 Package: grml-scripts
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, dialog, perl, zsh, dash, links | w3m | links2, screen, grml-etc-core
+Recommends: physlock
 Suggests: python, grml-rebuildfstab, grml-network, grml-files, dirvish, sudo, idesk, python-dbus, notification-daemon, grml-quickconfig, lzop, alsa-utils
 Description: Collection of little tools
  This package contains a lot of scripts and is only really suited
diff --git a/usr_bin/grml-lock b/usr_bin/grml-lock
index 0d47922..673be73 100755
--- a/usr_bin/grml-lock
+++ b/usr_bin/grml-lock
@@ -14,7 +14,7 @@ if [ "$1" = "-h" ] || [ "$1" = "--help" ] ; then
   echo "${PN}: wrapper script to lock desktop
 
 This script is a wrapper to lock your desktop session
-through the vlock application.
+through the physlock application.
 
 Usage: just execute $PN without any further options."
   exit 0
@@ -22,7 +22,7 @@ fi
 
 if [ -r /etc/grml/script-functions ] ; then
    . /etc/grml/script-functions
-   check4progs vlock sudo chpasswd dialog || { echo "Sorry, necessary tools missing - can not continue. Exiting.">&2 ; exit 1 ; }
+   check4progs physlock sudo chpasswd dialog || { echo "Sorry, necessary tools missing - can not continue. Exiting.">&2 ; exit 1 ; }
 fi
 
 PWD_TEXT1="Set password (hidden typing):"
@@ -44,7 +44,7 @@ and therefore might not work as intended." 7 70
 fi
 
 lock_desktop() {
-  vlock -a -n -s
+  sudo physlock -u "$USER"
 }
 
 is_passwd_set() {