[Fai-commit] r5876 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2010-07-27 02:39:45 +0000 (Tue, 27 Jul 2010)
New Revision: 5876

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
make-fai-nfsroot: remove variable $FAI_BOOT

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2010-07-27 02:30:39 UTC (rev 5875)
+++ trunk/bin/make-fai-nfsroot	2010-07-27 02:39:45 UTC (rev 5876)
@@ -141,6 +141,7 @@
 [ -z "$TFTPROOT" ] && badupdateto32 "\$TFTPROOT is not set. Please check your settings in $cfdir/make-fai-nfsroot.conf."
 [ -n "$KERNELPACKAGE" ] && badupdateto32 "The use of \$KERNELPACKAGE is deprecated. Please use $cfdir/NFSROOT now."
 [ ! -d "$cfdir/apt" ] && die "$cfdir/apt/ does not exists. Can't continue."
+[ -n "$FAI_BOOT" ] && die "Variable \$FAI_BOOT is not supported any more. Will only set up DHCP environment." 
 
 oldnfsroot=$NFSROOT
 NFSROOT="$NFSROOT/live/filesystem.dir"
@@ -457,24 +458,8 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 kernel_install() {
 
-# Install the kernel package
-
-    # create tftp boot images
     call_with_stamp install_kernel_nfsroot
-
-    # setup for DHCP, BOOTP or both
-    [ "x$FAI_BOOT" = "x" ] && FAI_BOOT="dhcp"
-    
-    for bootopt in $FAI_BOOT; do
-    	case $bootopt in
-    		dhcp|DHCP)      
-			call_with_stamp setup_dhcp ;;
-    		bootp|BOOTP)      
-			echo "You have to setup BOOTP support manually." ;;
-		*)
-			echo "Unknown boot option" ;;
-    	esac
-    done
+    call_with_stamp setup_dhcp ;;
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 run_hooks() {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-27 02:30:39 UTC (rev 5875)
+++ trunk/debian/changelog	2010-07-27 02:39:45 UTC (rev 5876)
@@ -59,6 +59,7 @@
   * fai-cd: add grub2 support (thanks to Sebastian Hetze for the patch)
     remove test which is already done before
   * fai-cd.8: add option -G
+  * make-fai-nfsroot: remove variable $FAI_BOOT
   
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks