From 5700bb3866d97c4e350f63d048e31212dec9af38 Mon Sep 17 00:00:00 2001 From: Frank Benkstein Date: Sat, 11 Aug 2007 11:57:01 +0200 Subject: [PATCH] src/vlock.sh, src/vlock-current.c: even "Please press [ENTER]" message from environment --- src/vlock-current.c | 1 - src/vlock.sh | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/vlock-current.c b/src/vlock-current.c index 7edd35c..810ea4a 100644 --- a/src/vlock-current.c +++ b/src/vlock-current.c @@ -108,7 +108,6 @@ int main(void) { fprintf(stderr, "%s\n", vlock_message); /* wait for enter to be pressed */ - fprintf(stderr, "Please press [ENTER] to unlock.\n"); while (read(STDIN_FILENO, &c, 1) >= 0) if (c == '\n') break; diff --git a/src/vlock.sh b/src/vlock.sh index fa15196..df454a2 100644 --- a/src/vlock.sh +++ b/src/vlock.sh @@ -105,7 +105,8 @@ main() { : ${VLOCK_MESSAGE:="\ The entire console display is now completely locked. You will not be able to switch to another virtual console. -"} + +Please press [ENTER] to unlock."} export VLOCK_MESSAGE if [ $nosysrq -ne 0 ] ; then @@ -122,7 +123,10 @@ You will not be able to switch to another virtual console. checked_exec "$VLOCK_ALL" fi else - : ${VLOCK_MESSAGE:="This TTY is now locked."} + : ${VLOCK_MESSAGE:="\ +This TTY is now locked. + +Please press [ENTER] to unlock."} export VLOCK_MESSAGE checked_exec "$VLOCK_CURRENT" -- 2.11.4.GIT