[Fai-commit] r3144 - in trunk: . bin debian

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-12-04 15:48:57 +0000 (Sun, 04 Dec 2005)
New Revision: 3144

Modified:
   trunk/NEWS
   trunk/bin/fai-chboot
   trunk/debian/changelog
Log:
define nfsroot using fai-chboot, same as root-path in dhcpd.conf


Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2005-12-04 15:43:31 UTC (rev 3143)
+++ trunk/NEWS	2005-12-04 15:48:57 UTC (rev 3144)
@@ -11,6 +11,9 @@
       interface, new option -B creates 2.88M floppy
     - use md5 hash for passwords
     - backticks and variables can't be used in package_config any more
+    - root-path does not need to be defined in dhcpd.conf any more
+      (fai-chboot does it for you)
+    - use NFS V3 for nfsroot
 
 New in FAI 2.8.4
 

Modified: trunk/bin/fai-chboot
===================================================================
--- trunk/bin/fai-chboot	2005-12-04 15:43:31 UTC (rev 3143)
+++ trunk/bin/fai-chboot	2005-12-04 15:48:57 UTC (rev 3144)
@@ -27,7 +27,8 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #*********************************************************************
 
-$version="version 1.5.3, 5-apr-2005";
+# variable needed: $nfsroot
+$version="version 1.6, 4-dec-2005";
 
 use Socket;
 use Net::hostent;
@@ -213,10 +214,15 @@
   $action="FAI_ACTION=install";
 }
 
+# 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;
+
 if ($opt_i) {
   # create config so host will boot the install kernel
   $kernelname = 'kernel vmlinuz-install';
-  $rootfs     = '/dev/nfs';
+  $rootfs     = "/dev/nfs nfsroot=$nfsroot,v3,rsize=32768,wsize=32768";
   $bootprot   = "ip=dhcp devfs=nomount $action";
 } elsif ($opt_o) {
   $kernelname = 'localboot 0';

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-12-04 15:43:31 UTC (rev 3143)
+++ trunk/debian/changelog	2005-12-04 15:48:57 UTC (rev 3144)
@@ -40,7 +40,8 @@
   * ftar: test if $single is set (closes: #340421)
   * FAIBASE/30-interface: do not overwrite resolv.conf if it's a symlink
     (closes: #305783)
-  * setup_harddisks: add i2o support (closes: #317797)
+  * setup_harddisks: add i2o support (closes: #317797), add workaround for
+    udev behaviour
   * GRUB/10-setup: use -U with fcopy, so grub's menu.lst will not be
     overwritten during softupdate (closes: #313069, #314995)
   * subroutines-linux: fix idempotent code (closes: #340422)
@@ -48,8 +49,10 @@
     available (closes: #334373)
   * lib/updatebase: mount /dev into chroot during installation if we are
     running udev
+  * fai-chboot: read $NFSROOT from fai.conf, add nfsroot option to kernel
+    parameters, root-path can now be removed from dhcpd.conf
 
- -- Thomas Lange <lange at debian.org>  Fri,  2 Dec 2005 14:05:11 +0100
+ -- Thomas Lange <lange at debian.org>  Sun,  4 Dec 2005 16:47:15 +0100
 
 fai (2.8.4) unstable; urgency=high