[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-28-gbac4d64

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit bac4d64def81f434bc454b6d87ef93dbb4993234
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Tue Aug 21 13:03:56 2012 +0200

    Make xfce4 the default desktop in combination with lightdm.

diff --git a/fai/config/package_config/DESKTOP b/fai/config/package_config/DESKTOP
index 0ccf676..ec21062 100644
--- a/fai/config/package_config/DESKTOP
+++ b/fai/config/package_config/DESKTOP
@@ -17,7 +17,8 @@ xfce4
 #task-xfce4-desktop
 
 ## other packages:
-gdm3
+lightdm policykit-1
+#gdm3
 menu
 eog
 evince
diff --git a/fai/config/scripts/DESKTOP/10-groups b/fai/config/scripts/DESKTOP/10-groups
index e479b10..d90556d 100755
--- a/fai/config/scripts/DESKTOP/10-groups
+++ b/fai/config/scripts/DESKTOP/10-groups
@@ -2,11 +2,11 @@
 
 set -e
 
-## The following is is needed if you need to have group membership 
-## assigned to users on login.   
+## The following is is needed if you need to have group membership
+## assigned to users on login.
 
 ## Example:  Configure PAM to add users to the dialout group (needed
-## to access /dev/tty*): 
+## to access /dev/tty*):
 
-ainsl -q /etc/security/group.conf "gdm3;*;*;Al0000-2400;dialout"
-ainsl -q /etc/pam.d/gdm3 "auth    optional        pam_group.so"
+ainsl -q /etc/security/group.conf "*;*;*;Al0000-2400;dialout"
+ainsl -q /etc/pam.d/common-auth "auth    optional        pam_group.so"
diff --git a/fai/config/scripts/DESKTOP/20-default-desktop b/fai/config/scripts/DESKTOP/20-default-desktop
index a43f334..70f0114 100755
--- a/fai/config/scripts/DESKTOP/20-default-desktop
+++ b/fai/config/scripts/DESKTOP/20-default-desktop
@@ -3,3 +3,4 @@
 ## Uncomment to make LXDE the default desktop:
 
 #$ROOTCMD update-alternatives --set x-session-manager /usr/bin/startlxde
+$ROOTCMD update-alternatives --set x-session-manager /usr/bin/startxfce4

-- 
Debian-LAN development and packaging