projects
/
grml-scripts-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop runit manpage. Thanks for the hint, gebi
[grml-scripts-core.git]
/
usr_bin
/
grml-lock
diff --git
a/usr_bin/grml-lock
b/usr_bin/grml-lock
index
f3011e4
..
6b0bf59
100755
(executable)
--- a/
usr_bin/grml-lock
+++ b/
usr_bin/grml-lock
@@
-4,14
+4,18
@@
# 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.
# 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 [ -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
fi
if [ -r /etc/grml_version ] ; then
@@
-96,14
+100,18
@@
case $retval in
esac
}
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 #################################################################
fi
## END OF FILE #################################################################