summaryrefslogtreecommitdiffstats
path: root/core/modules/idleaction
diff options
context:
space:
mode:
authorSimon Rettberg2018-10-12 15:50:01 +0200
committerSimon Rettberg2018-10-12 15:50:01 +0200
commit603712b955e3017e732e25ede4bf428a98778c80 (patch)
tree9c4ca10f29345590d3596ff96e79f9c90fab46fe /core/modules/idleaction
parent[idleaction] Remember lock time and reset idletime if changed (diff)
downloadmltk-603712b955e3017e732e25ede4bf428a98778c80.tar.gz
mltk-603712b955e3017e732e25ede4bf428a98778c80.tar.xz
mltk-603712b955e3017e732e25ede4bf428a98778c80.zip
[idleaction/kiosk] Don't wait 5 minutes for demo to logout
Diffstat (limited to 'core/modules/idleaction')
-rwxr-xr-xcore/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_action6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_action b/core/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_action
index 2717d6cb..df9fd65c 100755
--- a/core/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_action
+++ b/core/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_action
@@ -77,7 +77,11 @@ runaction () {
sleep $(( DELAY * 60 ))
fi
for MINUTES in 5 X X X X X X X 3 X X X 2 X X X 1 X X X; do
- NUM=$(who | wc -l)
+ if [ -f "/run/openslx/demo-no-logout-delay" ]; then
+ NUM=$(who | grep -v '^demo ' | wc -l)
+ else
+ NUM=$(who | wc -l)
+ fi
[ "$NUM" = "0" ] && break
if [ "$MINUTES" != "X" ]; then
USERS=0