[debian-edu-commits] debian-edu/ 03/05: Add support for lightdm too.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository shutdown-at-night.

commit 338e21cf53b2fd1fc16bb43827454e34af3e48cd
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Nov 20 13:11:21 2013 +0100

    Add support for lightdm too.
---
 debian/changelog  |    5 +++--
 shutdown-at-night |    3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c24cc6..dd3dbf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ shutdown-at-night (0.13) UNRELEASED; urgency=low
     + Add file. Use format 1.0 to match capabilities of Debian Edu's dak.
 
   [ Petter Reinholdtsen ]
-  * Rewrite logic checking if a host is unused to look for the KDM login
-    screen to confirm the X sessions are unused (Closes: #729553).
+  * Rewrite logic checking if a host is unused to look for the KDM or
+    lightdm login screen to confirm the X sessions are unused
+    (Closes: #729553).
   * Add depend on x11-utils for the xlsclients tool used to check unused
     X sessions.
 
diff --git a/shutdown-at-night b/shutdown-at-night
index d1208c8..d711c72 100755
--- a/shutdown-at-night
+++ b/shutdown-at-night
@@ -119,10 +119,11 @@ is_active_ldm_session() {
 is_xsession_used() {
     for s in \
 	/var/run/gdm3/auth-for-Debian-gdm-*/database \
+	/var/lib/lightdm/.Xauthority \
 	/var/run/xauth/* \
 	/run/xauth/*; do
 	if [ -e "$s" ] ; then
-	    if XAUTHORITY="$s" DISPLAY=:0 xlsclients | egrep -q 'kdmgreet' ; then
+	    if XAUTHORITY="$s" DISPLAY=:0 xlsclients | egrep -q 'kdmgreet|lightdm-gtk-greeter' ; then
 		return 1
 	    fi
 	fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/shutdown-at-night.git