diff options
| author | Simon Rettberg | 2019-04-30 16:20:41 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-04-30 16:20:41 +0200 |
| commit | 21eb074c5bd73f371222e5321c9fcd7ef6daec76 (patch) | |
| tree | 3e2ebd7a7f597ca6eb245f5d2adf1be391bec1a7 /core/modules/xscreensaver | |
| parent | [idleaction] Allow root access to display (diff) | |
| download | mltk-21eb074c5bd73f371222e5321c9fcd7ef6daec76.tar.gz mltk-21eb074c5bd73f371222e5321c9fcd7ef6daec76.tar.xz mltk-21eb074c5bd73f371222e5321c9fcd7ef6daec76.zip | |
[xscreensaver] Force locking is disabled in exam mode; handle empty gracetime
Empty grace period should mean "disable automatic locking when
the screen saver activates"
Diffstat (limited to 'core/modules/xscreensaver')
| -rwxr-xr-x | core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver | 9 |
1 files changed, 7 insertions, 2 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 8953aa83..4900658e 100755 --- a/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver +++ b/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver @@ -16,6 +16,7 @@ if which xscreensaver; then SBY=${SLX_SCREEN_STANDBY_TIMEOUT} if [ -n "${SLX_EXAM}" ]; then SLX_LOGOUT_TIMEOUT=0 + SLX_SCREEN_SAVER_TIMEOUT=0 SBY=0 elif [ -z "$SBY" ]; then SBY=0 @@ -39,9 +40,13 @@ if which xscreensaver; then [ "$SBY" -gt 0 ] && DPMS=True STANDBY="$( secsToTime "$SBY" )" # Explicit screen saver timeout set - TIMEOUT="$( secsToTime "$SLX_SCREEN_SAVER_TIMEOUT" )" + if [ "$SLX_SCREEN_SAVER_TIMEOUT" -gt 0 ]; then + TIMEOUT="$( secsToTime "$SLX_SCREEN_SAVER_TIMEOUT" )" + else + TIMEOUT="99:00:00" + fi if [ -z "$SLX_SCREEN_SAVER_GRACE_TIME" ]; then - GRACE="00:00:15" + GRACE="99:00:00" else GRACE="$( secsToTime "$SLX_SCREEN_SAVER_GRACE_TIME" )" fi |