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

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit a508c52f1358987fa128b5c96bf8a32ed8eaf13b
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Mon Aug 20 15:09:38 2012 +0200

    Improvements on setting up the nfsroot after installation.

diff --git a/fai/config/files/etc/rc.local/FAISERVER b/fai/config/files/etc/rc.local/FAISERVER
index f32cdcb..a44331d 100755
--- a/fai/config/files/etc/rc.local/FAISERVER
+++ b/fai/config/files/etc/rc.local/FAISERVER
@@ -3,20 +3,27 @@
 set -e
 
 ## Setup script run at boot time.
-## Removed after successful execution.
+## Moved after successful execution.
 
 ############################
-# Remove to enable:
+TIMEOUT=60
 cat <<EOF
-=====================================================================
+================================================================================
 The nfsroot for FAI may be created by executing $0.
-This can be done at boot time or manually.
-To enable, remove the lines marked in $0 and
-reboot or execute $0.
-=====================================================================
+This can be done now, later or manually.
+Internet access is needed to download packages.
+If unanswered, this script will exit after $TIMEOUT seconds.
+
 EOF
-exit 0
-###########################
+read -e -t $TIMEOUT -n 1 -p "Install the nfsroot for FAI now? [y|N]: " inp
+inp=${inp:-N}
+case $inp in
+    y)
+	;;
+    *)
+	exit 0
+	;;
+esac
 
 echo "Creating the nfsroot for FAI."
 

-- 
Debian-LAN development and packaging