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

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit cf6c120a6d82a7f56236d824a8b29d1275c2cd3a
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Sun Dec 4 13:10:54 2011 +0100

    Install gdm3 instead of gdm to avoid conflicts when installing
    gnome-desktop-environment.
    Do not install munin-node because it spoils the installation,
    c.f. #612481.

diff --git a/fai/config/package_config/DESKTOP b/fai/config/package_config/DESKTOP
index 215b00b..dda9702 100644
--- a/fai/config/package_config/DESKTOP
+++ b/fai/config/package_config/DESKTOP
@@ -8,7 +8,7 @@ gnome-applets
 #gnome-desktop-environment
 #gnome
 
-gdm
+gdm3
 menu
 #arduino
 eog
diff --git a/fai/config/package_config/LOG_CLIENT b/fai/config/package_config/LOG_CLIENT
index 3a8912b..76c1b70 100644
--- a/fai/config/package_config/LOG_CLIENT
+++ b/fai/config/package_config/LOG_CLIENT
@@ -1,6 +1,7 @@
 ## Only list packages that are essential for the LOG_CLIENT class.
 ## Put all setup-dependent packages in the SETUP_* class.
 PACKAGES aptitude
-munin-node
+## munin-node spoils the installation because of #612481 
+#munin-node
 smartmontools
 lm-sensors
diff --git a/fai/config/scripts/DESKTOP/10-groups b/fai/config/scripts/DESKTOP/10-groups
index 86191d2..998b81a 100755
--- a/fai/config/scripts/DESKTOP/10-groups
+++ b/fai/config/scripts/DESKTOP/10-groups
@@ -7,5 +7,6 @@ set -e
 
 ## Example:  Configure PAM to add users to the dialout group (needed
 ## to access /dev/tty*): 
-ainsl -q $target/etc/security/group.conf "gdm;*;*;Al0000-2400;dialout"
-ainsl -q $target/etc/pam.d/gdm "auth    optional        pam_group.so"
+
+ainsl -q $target/etc/security/group.conf "gdm3;*;*;Al0000-2400;dialout"
+ainsl -q $target/etc/pam.d/gdm3 "auth    optional        pam_group.so"

-- 
Debian-LAN development and packaging