[Fai-commit] r5979 - in branches/stable/3.4: bin debian man

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:53:42 +0000 (Tue, 17 Aug 2010)
New Revision: 5979

Modified:
   branches/stable/3.4/bin/fai-chboot
   branches/stable/3.4/debian/changelog
   branches/stable/3.4/man/fai-chboot.8
Log:
fai-chboot,fai-chboot.8: add option -P


Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/bin/fai-chboot
===================================================================
--- branches/stable/3.4/bin/fai-chboot	2010-08-17 12:53:38 UTC (rev 5978)
+++ branches/stable/3.4/bin/fai-chboot	2010-08-17 12:53:42 UTC (rev 5979)
@@ -28,14 +28,14 @@
 #*********************************************************************
 
 # variable needed: $nfsroot
-$version="version 3.5.1 25-march-2010";
+$version="version 3.6 25-june-2010";
 
 use Socket;
 use Net::hostent;
 use Getopt::Std;
 use File::Copy;
 
-our ($opt_D, $opt_p,$opt_h,$opt_t,$opt_s,,$opt_C);
+our ($opt_D,$opt_p,$opt_h,$opt_t,$opt_s,$opt_C,$opt_P);
 $Getopt::Std::STANDARD_HELP_VERSION=1;
 
 $0=~ s#.+/##; # remove path from program name
@@ -268,6 +268,7 @@
 
   $append="append $initrd $bootprot $rootfs $opt_k $flags $action\n";
   print FILE $append;
+  print FILE "IPAPPEND 3\n" if $opt_P;
   close FILE;
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -361,7 +362,7 @@
   }
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-getopts('gBc:C:D:edhnvlLiIpf:Fk:Ss:tu:o') || usage;
+getopts('gBc:C:D:edhnvlLiIpf:Fk:Ss:tu:oP') || usage;
 $opt_h and usage;
 defined @ARGV or usage;
 

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:53:38 UTC (rev 5978)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:53:42 UTC (rev 5979)
@@ -1,4 +1,4 @@
-fai (3.4~beta3) unstable; urgency=low
+fai (3.4~beta4) unstable; urgency=low
 
   [ Thomas Lange ]
   * dhcp-edit: new command that adds or removes entries to/from dhcpd.conf
@@ -16,6 +16,7 @@
   * faimond-gui: Tk::Balloon is not used atm.
   * subroutines: show rx and tx bytes for network device at the end
   * control: change dependencies on fai-setup-storage
+  * fai-chboot,fai-chboot.8: add option -P
   
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks

Modified: branches/stable/3.4/man/fai-chboot.8
===================================================================
--- branches/stable/3.4/man/fai-chboot.8	2010-08-17 12:53:38 UTC (rev 5978)
+++ branches/stable/3.4/man/fai-chboot.8	2010-08-17 12:53:42 UTC (rev 5979)
@@ -1,5 +1,5 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.TH fai-chboot 8 "21 October 2009" "FAI 3.3"
+.TH fai-chboot 8 "25 June 2010" "FAI 4"
 .\"
 .\" File Name macro.  This used to be `.PN', for Path Name,
 .\" but Sun doesn't seem to like that very much.
@@ -116,6 +116,17 @@
 Preserve existing config files. The default is to overwrite an
 existing config file.
 .TP
+.B \-P
+Add the pxelinux option IPAPPEND 3 to the config file. This will add 
+two variables to the kernel command line, that are also defined as
+variables inside FAI.
+
+Example: 
+.ti 19
+BOOTIF=01-08-00-27-12-34-56
+.ti 19
+ip=123.45.9.99:123.45.9.11:123.45.9.254:255.255.255.128
+.TP
 .BI "\-s " SUFFIX
 Use SUFFIX to determine which kernel and initrd to use.
 .TP