[debian-edu-commits] debian-edu/ 01/01: Fix xsession test for special case gdm. (Closes: 787566).

[Wolfgang Schweer]

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

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

commit 8a7f991be0ff8c9bda45e82121d5c8d76f7ac6f9
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Tue Jun 2 22:30:29 2015 +0200

    Fix xsession test for special case gdm. (Closes: 787566).
---
 debian/changelog  | 7 +++++++
 shutdown-at-night | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9d218d..083ac4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+shutdown-at-night (0.16) UNRELEASED; urgency=medium
+
+  * Fix the xsession test to match the special case of gdm3 greeter no
+    longer running gdm-simple-greeter. (Closes: #787566).
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 02 Jun 2015 22:25:43 +0200
+
 shutdown-at-night (0.15) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/shutdown-at-night b/shutdown-at-night
index 9411014..11a7840 100755
--- a/shutdown-at-night
+++ b/shutdown-at-night
@@ -123,8 +123,9 @@ is_xsession_used() {
         /var/run/xauth/* \
         /run/xauth/*; do
         if [ -e "$s" ] ; then
-            if XAUTHORITY="$s" DISPLAY=:0 xlsclients | egrep -q 'kdmgreet|lightdm-gtk-greeter|razor-lightdm-greeter|lightdm-kde-greeter|gdm-simple-greeter' ; then
-                return 1
+            if [ XAUTHORITY="$s" DISPLAY=:0 xlsclients | egrep -q 'kdmgreet|lightdm-gtk-greeter|razor-lightdm-greeter|lightdm-kde-greeter' ] \
+               || [ -d /var/run/gdm3/greeter ] ; then
+               return 1
             fi
         fi
     done

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