[debian-edu-commits] r80571 - branches/wheezy/debian-edu-install/debian

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-13 13:08:52 +0000 (Thu, 13 Jun 2013)
New Revision: 80571

Modified:
   branches/wheezy/debian-edu-install/debian/changelog
   branches/wheezy/debian-edu-install/debian/debian-edu-install.xdebian-edu-firstboot.init
Log:
Add support for gdm3 and lightdm to the testsuite reporting
mechanism.

Modified: branches/wheezy/debian-edu-install/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-install/debian/changelog	2013-06-13 12:38:45 UTC (rev 80570)
+++ branches/wheezy/debian-edu-install/debian/changelog	2013-06-13 13:08:52 UTC (rev 80571)
@@ -2,6 +2,8 @@
 
   * debian/control, Vcs* headers: Replace svn.debian.org with
     anonscm.debian.org.
+  * Add support for gdm3 and lightdm to the testsuite reporting
+    mechanism.
 
  -- Holger Levsen <holger at debian.org>  Thu, 13 Jun 2013 13:43:15 +0200
 

Modified: branches/wheezy/debian-edu-install/debian/debian-edu-install.xdebian-edu-firstboot.init
===================================================================
--- branches/wheezy/debian-edu-install/debian/debian-edu-install.xdebian-edu-firstboot.init	2013-06-13 12:38:45 UTC (rev 80570)
+++ branches/wheezy/debian-edu-install/debian/debian-edu-install.xdebian-edu-firstboot.init	2013-06-13 13:08:52 UTC (rev 80571)
@@ -99,6 +99,16 @@
 	XAUTHORITY="/var/lib/gdm/:0.Xauth"
     fi
 
+    # Not KDM and GDM, perhaps GDM3
+    if [ -z "$XAUTHORITY" ] && [ -e /var/lib/gdm3/:0.Xauth ]; then
+	XAUTHORITY="/var/lib/gdm3/:0.Xauth"
+    fi
+
+    # Not KDM, GDM and GDM3, perhaps lightdm?
+    if [ -z "$XAUTHORITY" ] && [ -e /var/lib/lightdm/.Xauthority ]; then
+	XAUTHORITY="/var/lib/lightdm/.Xauthority"
+    fi
+
     if [ "$XAUTHORITY" ] && XAUTHORITY=$XAUTHORITY DISPLAY=:0 xhost > /dev/null 2>&1 ; then
         # Try to use kde frontend (require libqt-perl) or gnome frontend
         # (libgtk2-perl).  debconf will fall back to dialog if either