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

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 8a8f5f74fca0265670d1ddaeb4c5088e71befdf1
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Mon Jan 9 21:03:47 2012 +0100

    Minor fixes and improvements.

diff --git a/fai/config/disk_config/CLIENT_A b/fai/config/disk_config/CLIENT_A
index d28202b..5ba34fd 100644
--- a/fai/config/disk_config/CLIENT_A
+++ b/fai/config/disk_config/CLIENT_A
@@ -13,7 +13,7 @@ disk_config lvm
 
 ## use 'vda5' for virtual disks:
 vg  vg_system  vda5
-vg_system-root  /      500M-     ext3  errors=remount-ro
+vg_system-root  /      500M-10G  ext3  errors=remount-ro
 vg_system-usr   /usr   3G-20G    ext3  defaults 
 vg_system-var   /var   1G-       ext3  defaults
 
diff --git a/fai/config/files/etc/rc.local/FAISERVER b/fai/config/files/etc/rc.local/FAISERVER
index f3a494f..60c4dec 100755
--- a/fai/config/files/etc/rc.local/FAISERVER
+++ b/fai/config/files/etc/rc.local/FAISERVER
@@ -18,12 +18,11 @@ fi
 URL=`echo $FAI_DEBOOTSTRAP | awk '{print $2}'`
 ## Check if package repository is accessible:     
 if wget --quiet --output-document=/tmp/fai-setup $URL ; then
-    fai-setup -ev 2>&1 | tee /var/log/fai-setup.log
-    echo "Log files are saved to /var/log/fai-setup.log"
+    fai-setup -e
     ## Create pxelinux boot configuration for workstation*:
     for i in `seq 0 1` ; do
 	for j in `seq 0 9` ; do
-	    fai-chboot -IFv workstation$i$j 
+	    fai-chboot -IFv workstation$i$j  2>&1 | tee /var/log/fai/fai-chboot.log 
 	done
     done
     ## remove me, things are prepared now:
diff --git a/fai/config/package_config/DEVTOOLS b/fai/config/package_config/DEVTOOLS
index b3b0e2c..76782f3 100644
--- a/fai/config/package_config/DEVTOOLS
+++ b/fai/config/package_config/DEVTOOLS
@@ -1,4 +1,14 @@
 ## Optional packages for development.
 PACKAGES aptitude
+## General purpose:
 emacs
+git
+
+## Diagnostics:
+gbd
 lsof
+ltrace
+nmap
+
+## LDAP:
+ldap-utils

-- 
Debian-LAN development and packaging