diff options
| author | Steffen Ritter | 2018-04-20 15:22:58 +0200 |
|---|---|---|
| committer | Steffen Ritter | 2018-04-20 15:22:58 +0200 |
| commit | 231b5eeee3a3a814a82eba67608fa56091222d1d (patch) | |
| tree | 8a9403c44cc801978939ad05064d4869017f17c4 /core | |
| parent | Revert "[safe-mode] disable screen going to standby/poweroff" (diff) | |
| download | mltk-231b5eeee3a3a814a82eba67608fa56091222d1d.tar.gz mltk-231b5eeee3a3a814a82eba67608fa56091222d1d.tar.xz mltk-231b5eeee3a3a814a82eba67608fa56091222d1d.zip | |
[safe-mode] disable screen standby the right way
Diffstat (limited to 'core')
| -rwxr-xr-x | core/modules/screen-standby/data/opt/openslx/scripts/screen-standby | 1 | ||||
| -rwxr-xr-x | core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/modules/screen-standby/data/opt/openslx/scripts/screen-standby b/core/modules/screen-standby/data/opt/openslx/scripts/screen-standby index 74a09556..11691fbd 100755 --- a/core/modules/screen-standby/data/opt/openslx/scripts/screen-standby +++ b/core/modules/screen-standby/data/opt/openslx/scripts/screen-standby @@ -6,6 +6,7 @@ do_standby_stuff () { . /opt/openslx/config # Make sure SLX_SCREEN_STANDBY_TIMEOUT is numeric TO=${SLX_SCREEN_STANDBY_TIMEOUT} + [ -n "${SLX_EXAM}" ] && TO=0 [ -z "${TO}" ] && TO=0 [ "${TO}" -gt 0 ] || [ "${TO}" -lt 100 ] || TO=600 [ "${TO}" -lt 0 ] && TO=0 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 fc6588ae..469e090a 100755 --- a/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver +++ b/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver @@ -6,6 +6,7 @@ if which xscreensaver; then if ! [ -s "$HOME/.xscreensaver" ]; then . /opt/openslx/config NUM=${SLX_SCREEN_STANDBY_TIMEOUT} + [ -n "${SLX_EXAM}" ] && NUM=0 if [ -n "$NUM" ] && [ "$NUM" -gt 60 ]; then SECS=0$(( NUM % 60 )) MINS=0$(( ( NUM / 60 ) % 60 )) |