[Fai-commit] r6045 - branches/stable/3.4/bin
Michael Prokop
mika at alioth.debian.org
Tue Aug 17 12:59:12 UTC 2010
Author: mika
Date: 2010-08-17 12:59:11 +0000 (Tue, 17 Aug 2010)
New Revision: 6045
Modified:
branches/stable/3.4/bin/make-fai-nfsroot
Log:
Revert wrongly applied 6326855.
Signed-off-by: Michael Prokop <mika at grml.org>
Modified: branches/stable/3.4/bin/make-fai-nfsroot
===================================================================
--- branches/stable/3.4/bin/make-fai-nfsroot 2010-08-17 12:59:03 UTC (rev 6044)
+++ branches/stable/3.4/bin/make-fai-nfsroot 2010-08-17 12:59:11 UTC (rev 6045)
@@ -141,7 +141,6 @@
[ -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"
@@ -458,8 +457,24 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
kernel_install() {
+# Install the kernel package
+
+ # create tftp boot images
call_with_stamp install_kernel_nfsroot
- call_with_stamp setup_dhcp
+
+ # 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
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
run_hooks() {
More information about the Fai-commit
mailing list