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

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 72e2a5abc5f7c77dc19152e57e0e9bbd64d66bdd
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Tue Apr 3 21:04:36 2012 +0200

    Modify desktop package selection and default desktop.
    
    Use minimal gnome as default desktop, lxde optional.  Add comment on
    how to enable lxde as default and customize the package selection.

diff --git a/fai/config/package_config/DESKTOP b/fai/config/package_config/DESKTOP
index dda9702..8ea277a 100644
--- a/fai/config/package_config/DESKTOP
+++ b/fai/config/package_config/DESKTOP
@@ -1,13 +1,19 @@
 PACKAGES aptitude
+
+## minimal gnome+lxde desktop:
 lxde
 lxtask
 desktop-base
-
 gnome-session
 gnome-applets
+
+## standard gnome desktop:
 #gnome-desktop-environment
+
+## gnome desktop:
 #gnome
 
+## other packages:
 gdm3
 menu
 #arduino
@@ -18,7 +24,7 @@ gnome-screenshot
 iceweasel
 inkscape
 gimp
-openoffice.org  # FIXME libreoffice 
+openoffice.org  # FIXME libreoffice
 anacron
 krb5-auth-dialog
 unattended-upgrades
diff --git a/fai/config/package_config/DISKLESS_CLIENT b/fai/config/package_config/DISKLESS_CLIENT
index 58a42bf..5cbbfc9 100644
--- a/fai/config/package_config/DISKLESS_CLIENT
+++ b/fai/config/package_config/DISKLESS_CLIENT
@@ -2,15 +2,21 @@ PACKAGES aptitude
 nbd-client
 libpam-script
 
+## minimal gnome+lxde desktop:
 lxde
 lxtask
 desktop-base
-
 gnome-session
 gnome-applets
+
+## standard gnome desktop:
 #gnome-desktop-environment
+
+## gnome desktop:
 #gnome
 
+
+## other packages:
 gdm3
 menu
 #arduino
@@ -21,7 +27,7 @@ gnome-screenshot
 iceweasel
 inkscape
 gimp
-openoffice.org  # FIXME libreoffice 
+openoffice.org  # FIXME libreoffice
 krb5-auth-dialog
 
 ## From FAIBASE:
diff --git a/fai/config/scripts/DESKTOP/20-default-desktop b/fai/config/scripts/DESKTOP/20-default-desktop
index bace735..a43f334 100755
--- a/fai/config/scripts/DESKTOP/20-default-desktop
+++ b/fai/config/scripts/DESKTOP/20-default-desktop
@@ -1,3 +1,5 @@
 #!/bin/bash
 
-$ROOTCMD update-alternatives --set x-session-manager /usr/bin/startlxde
+## Uncomment to make LXDE the default desktop:
+
+#$ROOTCMD update-alternatives --set x-session-manager /usr/bin/startlxde

-- 
Debian-LAN development and packaging