[Fai-commit] r4360 - in trunk: bin conf

[lange at alioth.debian.org]

Author: lange
Date: 2007-06-23 20:29:45 +0000 (Sat, 23 Jun 2007)
New Revision: 4360

Modified:
   trunk/bin/fai-setup
   trunk/bin/make-fai-nfsroot
   trunk/conf/make-fai-nfsroot.conf
Log:
add variable TFTPROOT (closes: #408271)


Modified: trunk/bin/fai-setup
===================================================================
--- trunk/bin/fai-setup	2007-06-23 20:16:39 UTC (rev 4359)
+++ trunk/bin/fai-setup	2007-06-23 20:29:45 UTC (rev 4360)
@@ -150,7 +150,7 @@
 	chown $LOGUSER:$logusergid . .rhosts || true
 	[ -d .ssh ] && chown -R $LOGUSER:$logusergid .ssh || true
     fi
-    chown -R $LOGUSER:$logusergid /srv/tftp/fai || true
+    chown -R $LOGUSER:$logusergid $TFTPROOT || true
 fi
 
 if [ -z "$FAI_CONFIGDIR" ]; then

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2007-06-23 20:16:39 UTC (rev 4359)
+++ trunk/bin/make-fai-nfsroot	2007-06-23 20:29:45 UTC (rev 4360)
@@ -376,7 +376,7 @@
     if [ -x "`which mkelf-linux`" ]; then
 	# does not work any mork if we do not know the excatly kernel name
 :
-#	mkelf-linux --ip=any --output=/srv/tftp/fai/installimage \
+#	mkelf-linux --ip=any --output=$TFTPROOT/installimage \
 #	  $NFSROOT/boot/$kfile-$KERNELVERSION
     else
         echo "Command mkelf-linux not found. Can not set up BOOTP booting. Please install the package mknbi and rerun fai-setup."
@@ -386,7 +386,7 @@
     # imggen is free software from 3com - use ver1.00: 1.01 produces "Image too Big" errors.
     # it converts netboot images to images which are bootable by 3com network cards
     if [ -x "`which imggen`" ]; then
-	imggen -a /srv/tftp/fai/installimage /srv/tftp/fai/installimage_3com
+	imggen -a $TFTPROOT/installimage $TFTPROOT/installimage_3com
     fi
     echo "BOOTP environment prepared."
 }
@@ -397,11 +397,11 @@
     # pxe and dhcp environment
     local pxebin=/usr/lib/syslinux/pxelinux.0
     rm -f $NFSROOT/boot/*.bak
-    cp -pv $NFSROOT/boot/$kfile-* /srv/tftp/fai/
-    cp -pv $NFSROOT/boot/$ifile-* /srv/tftp/fai/
-#    echo "Kernel $KERNELVERSION copied to /srv/tftp/fai/$kernelname"
-    [ -f $pxebin ] && cp $pxebin /srv/tftp/fai
-    [ -d /srv/tftp/fai/pxelinux.cfg ] || mkdir -p /srv/tftp/fai/pxelinux.cfg
+    cp -pv $NFSROOT/boot/$kfile-* $TFTPROOT
+    cp -pv $NFSROOT/boot/$ifile-* $TFTPROOT
+#    echo "Kernel $KERNELVERSION copied to $TFTPROOT/$kernelname"
+    [ -f $pxebin ] && cp $pxebin $TFTPROOT
+    [ -d $TFTPROOT/pxelinux.cfg ] || mkdir -p $TFTPROOT/pxelinux.cfg
     echo "DHCP environment prepared. If you want to use it, you have to enable the dhcpd and the tftp-hpa daemon."
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Modified: trunk/conf/make-fai-nfsroot.conf
===================================================================
--- trunk/conf/make-fai-nfsroot.conf	2007-06-23 20:16:39 UTC (rev 4359)
+++ trunk/conf/make-fai-nfsroot.conf	2007-06-23 20:29:45 UTC (rev 4360)
@@ -5,6 +5,9 @@
 # created, approx size: 250MB, also defined in bootptab or dhcp.conf
 NFSROOT=/srv/fai/nfsroot
 
+# TFTP root directory
+TFTPROOT=/srv/tftp/fai
+
 # Add a line for mirrorhost and installserver when DNS is not available
 # on the clients. This line(s) will be added to $nfsroot/etc/hosts.
 #NFSROOT_ETC_HOSTS="192.168.1.250 yourinstallserver"