diff options
| author | Simon Rettberg | 2020-09-23 13:06:54 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2020-09-23 13:06:54 +0200 |
| commit | 584da8708a4fbd125be98279e7ceab449849e4c6 (patch) | |
| tree | 93ea4e1998979a3d589ca996e731955b52cbd1d8 /core/modules | |
| parent | [hardware-stats] Fix awk output format for numbers > 2^31 (diff) | |
| download | mltk-584da8708a4fbd125be98279e7ceab449849e4c6.tar.gz mltk-584da8708a4fbd125be98279e7ceab449849e4c6.tar.xz mltk-584da8708a4fbd125be98279e7ceab449849e4c6.zip | |
[idleaction] Disable screensaver in remoteaccess mode
Diffstat (limited to 'core/modules')
| -rwxr-xr-x | core/modules/idleaction/data/etc/X11/Xsession.d/95-xscreensaver | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/core/modules/idleaction/data/etc/X11/Xsession.d/95-xscreensaver b/core/modules/idleaction/data/etc/X11/Xsession.d/95-xscreensaver index 1d436bce..5cdeeac5 100755 --- a/core/modules/idleaction/data/etc/X11/Xsession.d/95-xscreensaver +++ b/core/modules/idleaction/data/etc/X11/Xsession.d/95-xscreensaver @@ -1,6 +1,6 @@ #!/bin/ash -if which xscreensaver; then +if command -v xscreensaver; then DPMS=False AUTOLOCK=True secsToTime() { @@ -16,6 +16,10 @@ if which xscreensaver; then . /opt/openslx/config SBY="${SLX_SCREEN_STANDBY_TIMEOUT}" SVR="${SLX_SCREEN_SAVER_TIMEOUT}" + if [ -n "${SLX_REMOTE_VNC}" ]; then + # TODO Remove after 2021-07-01, variables should be set by slx-admin + SVR=0 + fi if [ -n "${SLX_EXAM}" ]; then SLX_SCREEN_SAVER_GRACE_TIME= AUTOLOCK=False @@ -72,8 +76,13 @@ programs: /opt/openslx/bin/bwlp-screensaver selected: 0 EOF ( - # HACK: This prevents xscreensaver from ever locking - [ -n "$SLX_EXAM" ] && export RUNNING_UNDER_GDM="not really but yea" + # HACK: This env vars prevent xscreensaver from ever locking + # Only one would be needed but set both in case one of them + # gets removed in the future. + if [ -n "$SLX_EXAM" ]; then + export RUNNING_UNDER_GDM="not really but yea" + export WAYLAND_DISPLAY="none, haha" + fi xscreensaver -no-splash & ) fi |