From 7ffcaefbe9dcf6f3e72ed0302f7764a61cc433a4 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 12 Oct 2018 16:31:47 +0200
Subject: [idleaction] Move idle-file to /run/openslx/...

---
 .../modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'core/modules')

diff --git a/core/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script b/core/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
index df1e8f0d..f40ffa34 100755
--- a/core/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
+++ b/core/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
@@ -85,7 +85,7 @@ if [ -n "${SLX_LOGOUT_TIMEOUT}" ] && [ "${SLX_LOGOUT_TIMEOUT}" -gt 0 ]; then
 				fi
 				# Now consider locking - if the screen is locked, we don't want to consider the current idle time, but
 				# the idle time of when the screen was locked - look it up and if not found, write current value
-				RUNFILE="/run/idleaction-$DISPLAY"
+				RUNFILE="/run/openslx/idleaction-$DISPLAY"
 				[ -f "$RUNFILE" ] || gen_runfile > "$RUNFILE"
 				OLDLOCKTIME=$(awk -F= '{if ($1 == "lockTime") { print $2; exit } }' "$RUNFILE")
 				[ -z "$OLDLOCKTIME" ] && OLDLOCKTIME=0
@@ -164,6 +164,7 @@ else
 			[ ! -e "$IDLEHINT" ] && echo "$NOW" > "$IDLEHINT"
 		else
 			rm -f -- "$IDLEHINT"
+			gen_runfile > "/run/openslx/idleaction-:0" # hard-code for primary X session
 		fi
 	fi
 fi
-- 
cgit v1.2.3-55-g7522