diff options
| author | Simon Rettberg | 2019-11-18 16:52:04 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-11-18 16:52:04 +0100 |
| commit | 27482628f504f99c6ac856939690d7852f20eba6 (patch) | |
| tree | cf12718e7243a17fe6b92941e5b64f151bba7866 /core/modules/idleaction/data | |
| parent | [vmchooser2] Pre-select PVS if running on tutor machine (diff) | |
| download | mltk-27482628f504f99c6ac856939690d7852f20eba6.tar.gz mltk-27482628f504f99c6ac856939690d7852f20eba6.tar.xz mltk-27482628f504f99c6ac856939690d7852f20eba6.zip | |
[idleaction] .no-saver is not available yet in Xession.d
Generate .xscreensaver as if saver is allowed, then when we check what
the user selected in vmchooser, patch .xscreensaver if necessary.
Diffstat (limited to 'core/modules/idleaction/data')
| -rwxr-xr-x | core/modules/idleaction/data/etc/X11/Xsession.d/95-xscreensaver | 4 | ||||
| -rwxr-xr-x | core/modules/idleaction/data/opt/openslx/vmchooser/sessionstart.d/write-screensaver-flag | 1 |
2 files changed, 3 insertions, 2 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 8a203f9f..478c02e1 100755 --- a/core/modules/idleaction/data/etc/X11/Xsession.d/95-xscreensaver +++ b/core/modules/idleaction/data/etc/X11/Xsession.d/95-xscreensaver @@ -16,7 +16,7 @@ if which xscreensaver; then . /opt/openslx/config SBY="${SLX_SCREEN_STANDBY_TIMEOUT}" SVR="${SLX_SCREEN_SAVER_TIMEOUT}" - if [ -n "${SLX_EXAM}" ] || [ -e "$HOME/.no-saver" ]; then + if [ -n "${SLX_EXAM}" ]; then SLX_SCREEN_SAVER_GRACE_TIME= AUTOLOCK=False SBY=0 @@ -50,7 +50,7 @@ if which xscreensaver; then else GRACE="$( secsToTime "$SLX_SCREEN_SAVER_GRACE_TIME" )" fi - # Always overwrite this file -- better for exam mode, or if .no-saver changed + # Always overwrite this file -- better for exam mode cat > "$HOME/.xscreensaver" <<EOF # Automatically generated on $(date) -- modifications might get lost mode: one diff --git a/core/modules/idleaction/data/opt/openslx/vmchooser/sessionstart.d/write-screensaver-flag b/core/modules/idleaction/data/opt/openslx/vmchooser/sessionstart.d/write-screensaver-flag index 88dd4c83..03f2c24c 100755 --- a/core/modules/idleaction/data/opt/openslx/vmchooser/sessionstart.d/write-screensaver-flag +++ b/core/modules/idleaction/data/opt/openslx/vmchooser/sessionstart.d/write-screensaver-flag @@ -4,6 +4,7 @@ if [ "$VMCHOOSER_DISABLE_SCREENSAVER" = "TRUE" ]; then touch "$HOME/.no-saver" + sed -i 's/^dpmsEnabled:.*$/dpmsEnabled: False/;s/^timeout:.*$/timeout: 99:00:00/' "$HOME/.xscreensaver" else rm -f -- "$HOME/.no-saver" fi |