[Fai-commit] r3570 - in trunk: bin examples/simple/files/etc/fai/fai.conf utils

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-07-14 13:02:16 +0000 (Fri, 14 Jul 2006)
New Revision: 3570

Modified:
   trunk/bin/fai-chboot
   trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER
   trunk/utils/create-nfsroot-tar
Log:
fix wrong pathes for nfsroot


Modified: trunk/bin/fai-chboot
===================================================================
--- trunk/bin/fai-chboot	2006-07-14 11:37:54 UTC (rev 3569)
+++ trunk/bin/fai-chboot	2006-07-14 13:02:16 UTC (rev 3570)
@@ -28,7 +28,7 @@
 #*********************************************************************
 
 # variable needed: $nfsroot
-$version="version 2.1.2 15-april-2006";
+$version="version 2.2 14-july-2006";
 
 use Socket;
 use Net::hostent;
@@ -374,7 +374,7 @@
 # read the nfsroot variable; a little bit ugly, but it works
 $nfsroot = `. /etc/fai/fai.conf 2>/dev/null; echo \$NFSROOT`;
 chomp $nfsroot;
-$nfsroot = '/usr/lib/fai/nfsroot' unless $nfsroot;
+$nfsroot = '/srv/fai/nfsroot' unless $nfsroot;
 
 if ($opt_i) {
   # create config so host will boot the install kernel

Modified: trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER	2006-07-14 11:37:54 UTC (rev 3569)
+++ trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER	2006-07-14 13:02:16 UTC (rev 3570)
@@ -55,7 +55,7 @@
 
 # directory on the install server where the nfsroot for FAI is
 # created, approx size: 160MB, also defined in bootptab or dhcp.conf
-NFSROOT=/usr/lib/fai/nfsroot
+NFSROOT=/srv/fai/nfsroot
 
 # the local configuration directory on the install client
 FAI=/fai

Modified: trunk/utils/create-nfsroot-tar
===================================================================
--- trunk/utils/create-nfsroot-tar	2006-07-14 11:37:54 UTC (rev 3569)
+++ trunk/utils/create-nfsroot-tar	2006-07-14 13:02:16 UTC (rev 3570)
@@ -10,7 +10,7 @@
 # After unpacking copy base2_2.tgz to $nfsroot/var/tmp, set up bootpd
 
 tarball=/tmp/fai-tarball.tar.bz2
-nfsroot=/usr/lib/fai/nfsroot
+nfsroot=/srv/fai/nfsroot
 
 cd /
 tar -cvf - $nfsroot /srv/tftp/fai /srv/fai/config | bzip2 > $tarball