summaryrefslogtreecommitdiffstats
path: root/core/modules/xscreensaver
diff options
context:
space:
mode:
authorSimon Rettberg2019-05-02 10:05:03 +0200
committerSimon Rettberg2019-05-02 10:05:03 +0200
commitc45bd71558a46dd75f3997952e9fd87b667ec6d6 (patch)
treeae7221146e99f7e0311f5b757f02c4bcae113bc0 /core/modules/xscreensaver
parent[xscreensaver] Force locking is disabled in exam mode; handle empty gracetime (diff)
downloadmltk-c45bd71558a46dd75f3997952e9fd87b667ec6d6.tar.gz
mltk-c45bd71558a46dd75f3997952e9fd87b667ec6d6.tar.xz
mltk-c45bd71558a46dd75f3997952e9fd87b667ec6d6.zip
[xscreensaver] Disable lockTimeout just to be safe
Diffstat (limited to 'core/modules/xscreensaver')
-rwxr-xr-xcore/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver b/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver
index 4900658e..2b4fbef5 100755
--- a/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver
+++ b/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver
@@ -1,6 +1,7 @@
#!/bin/ash
DPMS=False
+AUTOLOCK=True
if which xscreensaver; then
secsToTime() {
local NUM SECS MINS HRS
@@ -17,6 +18,8 @@ if which xscreensaver; then
if [ -n "${SLX_EXAM}" ]; then
SLX_LOGOUT_TIMEOUT=0
SLX_SCREEN_SAVER_TIMEOUT=0
+ SLX_SCREEN_SAVER_GRACE_TIME=
+ AUTOLOCK=False
SBY=0
elif [ -z "$SBY" ]; then
SBY=0
@@ -47,6 +50,7 @@ if which xscreensaver; then
fi
if [ -z "$SLX_SCREEN_SAVER_GRACE_TIME" ]; then
GRACE="99:00:00"
+ AUTOLOCK=False
else
GRACE="$( secsToTime "$SLX_SCREEN_SAVER_GRACE_TIME" )"
fi
@@ -55,7 +59,7 @@ if which xscreensaver; then
mode: one
cycle: 99:00:00
timeout: $TIMEOUT
-lock: True
+lock: $AUTOLOCK
lockTimeout: $GRACE
fade: False
unfade: False