From 65e5d5f3ec22042acd50ec9b5976b6162ef17e07 Mon Sep 17 00:00:00 2001
From: "Andreas B. Mundt" <andreas.mundt@steinbeisschule-reutlingen.de>
Date: Mon, 18 Dec 2023 13:00:16 +0100
Subject: [PATCH] The pwroff script fails in rare cases.

---
 roles/lmn_fvs/files/pwroff | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/roles/lmn_fvs/files/pwroff b/roles/lmn_fvs/files/pwroff
index 108aefe..84ee525 100755
--- a/roles/lmn_fvs/files/pwroff
+++ b/roles/lmn_fvs/files/pwroff
@@ -15,7 +15,7 @@ uid=${u[0]:-''}
 talk2dbus() {
     local display=":$(ls /tmp/.X11-unix/* | sed 's#/tmp/.X11-unix/X##' | head -n 1)"
     sudo -u $una DISPLAY=$display \
-	 DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus "$@" 2>/dev/null
+	 DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus "$@"
 }
 
 ########
@@ -37,7 +37,8 @@ else
         ## shutdown:
         #talk2dbus qdbus org.kde.ksmserver /KSMServer logout 1 2 0
         ## logout:
-        talk2dbus qdbus org.kde.ksmserver /KSMServer logout 1 0 0
+        talk2dbus qdbus org.kde.ksmserver /KSMServer logout 1 0 0 || \
+	    loginctl terminate-user $una
         echo "Log-out user $una after being idle for $idle seconds."
     else
         echo "The user $una has been idle for $idle seconds."