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

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 841aefa0fe90e28d33c32350b45d1a005ab18a75
Author: Andreas B. Mundt <andi at debian.org>
Date:   Thu Sep 20 10:50:59 2012 +0200

    Package selection:  Add MUAs and munin-node.

diff --git a/fai/config/package_config/DESKTOP b/fai/config/package_config/DESKTOP
index ec21062..13ad6f5 100644
--- a/fai/config/package_config/DESKTOP
+++ b/fai/config/package_config/DESKTOP
@@ -26,6 +26,7 @@ gcalctool
 gnome-screenshot
 
 iceweasel
+icedove
 
 inkscape
 gimp
diff --git a/fai/config/package_config/DISKLESS_CLIENT b/fai/config/package_config/DISKLESS_CLIENT
index 1e8ee1d..34f0be1 100644
--- a/fai/config/package_config/DISKLESS_CLIENT
+++ b/fai/config/package_config/DISKLESS_CLIENT
@@ -28,6 +28,7 @@ gcalctool
 gnome-screenshot
 
 iceweasel
+icedove
 
 inkscape
 gimp
@@ -54,4 +55,5 @@ eject
 locales
 console-common
 pciutils usbutils
-bsd-mailx
+#heirloom-mailx
+mutt
diff --git a/fai/config/package_config/FAIBASE b/fai/config/package_config/FAIBASE
index d7ce82c..c226b2d 100644
--- a/fai/config/package_config/FAIBASE
+++ b/fai/config/package_config/FAIBASE
@@ -20,5 +20,6 @@ pciutils usbutils
 lvm2
 
 nscd
-bsd-mailx
+#heirloom-mailx
+mutt
 cfengine2
diff --git a/fai/config/package_config/LOG_CLIENT b/fai/config/package_config/LOG_CLIENT
index 76c1b70..3a8912b 100644
--- a/fai/config/package_config/LOG_CLIENT
+++ b/fai/config/package_config/LOG_CLIENT
@@ -1,7 +1,6 @@
 ## Only list packages that are essential for the LOG_CLIENT class.
 ## Put all setup-dependent packages in the SETUP_* class.
 PACKAGES aptitude
-## munin-node spoils the installation because of #612481 
-#munin-node
+munin-node
 smartmontools
 lm-sensors
diff --git a/fai/config/package_config/LOG_SERVER b/fai/config/package_config/LOG_SERVER
index 0b9d6b0..7381ccc 100644
--- a/fai/config/package_config/LOG_SERVER
+++ b/fai/config/package_config/LOG_SERVER
@@ -3,9 +3,7 @@
 PACKAGES aptitude
 apache2
 munin
-
-## FIXME: Installing munin-node gives problems with /etc/init.d/nis #612481
-#munin-node
+munin-node
 
 smartmontools
 lm-sensors

-- 
Debian-LAN development and packaging