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

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 5104d4e824085293cde4956ff20960f994531875
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Sat Jan 14 22:05:06 2012 +0100

    Modifications for easier testing and development:
       Do not run fai-setup by default on first boot for now.
       Remove linuxlogo as it clears debug messages from the screen.

diff --git a/fai/config/files/etc/rc.local/FAISERVER b/fai/config/files/etc/rc.local/FAISERVER
index 60c4dec..9c16759 100755
--- a/fai/config/files/etc/rc.local/FAISERVER
+++ b/fai/config/files/etc/rc.local/FAISERVER
@@ -5,6 +5,11 @@ set -e
 ## Setup script run at boot time.
 ## Removed after successful execution. 
 
+echo "The nfsroot for FAI may be created by $0 at boot time. "
+echo "To enable, remove the line marked in $0. " 
+# Remove to enable: 
+exit 0
+
 echo "Creating the nfsroot for FAI."
 
 . /etc/fai/fai.conf
@@ -18,7 +23,7 @@ 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 -e
+    fai-setup -e -v
     ## Create pxelinux boot configuration for workstation*:
     for i in `seq 0 1` ; do
 	for j in `seq 0 9` ; do
diff --git a/fai/config/package_config/FAIBASE b/fai/config/package_config/FAIBASE
index d9ff8c9..3997f26 100644
--- a/fai/config/package_config/FAIBASE
+++ b/fai/config/package_config/FAIBASE
@@ -6,7 +6,6 @@ debconf-utils
 file
 hdparm
 less
-linuxlogo
 nfs-common
 nscd
 rsync

-- 
Debian-LAN development and packaging