projects
/
grml-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
grml-lock: allow using it on grml-small too
[grml-scripts.git]
/
usr_bin
/
grml-lock
diff --git
a/usr_bin/grml-lock
b/usr_bin/grml-lock
index
e6e50e1
..
9d63aaa
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 M
är 18 16:41:49 CE
T 2007 [mika]
+# Latest change: Son M
ai 06 15:52:16 CES
T 2007 [mika]
################################################################################
PN=$0
if [ -r /etc/grml/script-functions ] ; then
. /etc/grml/script-functions
################################################################################
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 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
@@
-21,7
+25,7
@@
it might not work as intended." 7 70
fi
welcome_screen() {
fi
welcome_screen() {
-dialog --stdout --title "$PN" --
msgbox
"Welcome to $PN!
+dialog --stdout --title "$PN" --
yes-label Continue --no-label Quit --yesno
"Welcome to $PN!
This script will lock virtual consoles when running
on console or lock X server when running X.
This script will lock virtual consoles when running
on console or lock X server when running X.
@@
-34,6
+38,13
@@
GNU screen)!
Report bugs, send wishes and feedback to the grml team:
http://www.grml.org/ - contact (at) grml.org
" 16 65
Report bugs, send wishes and feedback to the grml team:
http://www.grml.org/ - contact (at) grml.org
" 16 65
+
+ case $? in
+ (0) # everything ok
+ ;;
+ (1) echo "Cancel pressed." ; exit 1 ;;
+ (255) echo "ESC pressed." ; exit 255 ;;
+ esac
}
lockcons()
}
lockcons()
@@
-51,7
+62,7
@@
askxlock()
dialog --stdout --title "$PN" --yesno "Now lock X?" 0 0
retval=$?
case $retval in
dialog --stdout --title "$PN" --yesno "Now lock X?" 0 0
retval=$?
case $retval in
- 0)
+ 0)
lockx
;;
esac
lockx
;;
esac
@@
-73,7
+84,7
@@
askpwd()
dialog --stdout --title "$PN" --yesno "Set password for user $USER?" 0 0
retval=$?
case $retval in
dialog --stdout --title "$PN" --yesno "Set password for user $USER?" 0 0
retval=$?
case $retval in
- 0)
+ 0)
while [ -z "$PASSWD" ] ; do
PASSWD=$(dialog --stdout --title "$PN" --passwordbox "Set password (hidden typing):" 0 0)
if [ -n "$PASSWD" ] ; then
while [ -z "$PASSWD" ] ; do
PASSWD=$(dialog --stdout --title "$PN" --passwordbox "Set password (hidden typing):" 0 0)
if [ -n "$PASSWD" ] ; then