[Fai-commit] r4307 - trunk/bin

[lange at alioth.debian.org]

Author: lange
Date: 2007-06-11 09:51:12 +0000 (Mon, 11 Jun 2007)
New Revision: 4307

Modified:
   trunk/bin/fai-chboot
Log:
NFSROOT is now defined in make-fai-nfsroot.conf (closes: #408247)


Modified: trunk/bin/fai-chboot
===================================================================
--- trunk/bin/fai-chboot	2007-06-11 09:17:54 UTC (rev 4306)
+++ trunk/bin/fai-chboot	2007-06-11 09:51:12 UTC (rev 4307)
@@ -6,7 +6,7 @@
 # fai-chboot -- manage configuration for network boot
 #
 # This script is part of FAI (Fully Automatic Installation)
-# Copyright (C) 2003-2006 Thomas Lange, lange at informatik.uni-koeln.de
+# Copyright (C) 2003-2007 Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 #
 #*********************************************************************
@@ -28,7 +28,7 @@
 #*********************************************************************
 
 # variable needed: $nfsroot
-$version="version 3.2.1 23-nov-2006";
+$version="version 3.2.2 11-jun-2007";
 
 use Socket;
 use Net::hostent;
@@ -407,7 +407,7 @@
 }
 
 # read the nfsroot variable; a little bit ugly, but it works
-$nfsroot = `. /etc/fai/fai.conf 2>/dev/null; echo \$NFSROOT`;
+$nfsroot = `. /etc/fai/make-fai-nfsroot.conf 2>/dev/null; echo \$NFSROOT`;
 chomp $nfsroot;
 $nfsroot = '/srv/fai/nfsroot' unless $nfsroot;