[Fai-commit] r5584 - in trunk: bin debian man
Thomas Lange
lange at alioth.debian.org
Wed Oct 21 14:56:31 UTC 2009
Author: lange
Date: 2009-10-21 14:56:30 +0000 (Wed, 21 Oct 2009)
New Revision: 5584
Modified:
trunk/bin/fai-chboot
trunk/debian/changelog
trunk/man/fai-chboot.8
Log:
fai-chboot, fai-chboot.8: add option -u
Modified: trunk/bin/fai-chboot
===================================================================
--- trunk/bin/fai-chboot 2009-10-21 13:14:38 UTC (rev 5583)
+++ trunk/bin/fai-chboot 2009-10-21 14:56:30 UTC (rev 5584)
@@ -28,7 +28,7 @@
#*********************************************************************
# variable needed: $nfsroot
-$version="version 3.4.6 21-july-2009";
+$version="version 3.5 21-october-2009";
use Socket;
use Net::hostent;
@@ -361,7 +361,7 @@
}
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-getopts('gBc:C:D:edhnvlLiIpf:Fk:Ss:to') || usage;
+getopts('gBc:C:D:edhnvlLiIpf:Fk:Ss:tu:o') || usage;
$opt_h and usage;
defined @ARGV or usage;
@@ -433,7 +433,6 @@
# create config so host will boot the install kernel
$kernelname = "kernel vmlinuz-$kernelsuffix";
$initrd = "initrd=initrd.img-$kernelsuffix";
-# $rootfs = "root=/dev/nfs nfsroot=$nfsroot,v3,tcp,rsize=32768,wsize=32768 boot=live";
$rootfs = "root=/dev/nfs nfsroot=$nfsroot boot=live";
$bootprot = "ip=dhcp ";
@@ -451,8 +450,9 @@
$opt_F and $opt_f="verbose,sshd,createvt";
$opt_B and $opt_f="verbose,sshd,reboot";
$opt_f and $flags="FAI_FLAGS=$opt_f";
+$opt_u and $flags.=" FAI_CONFIG_SRC=$opt_u"; # set -u as FAI_CONFIG_SRC
warn "Booting $kernelname\n" if $verbose;
-warn " append $initrd $bootprot $opt_k $flags\n\n" if $verbose;
+warn " append $initrd $bootprot $opt_k\n $flags\n\n" if $verbose;
$opt_k && print "Kernel parameters: $opt_k\n";
die "No host specified.\n" unless @ARGV;
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-10-21 13:14:38 UTC (rev 5583)
+++ trunk/debian/changelog 2009-10-21 14:56:30 UTC (rev 5584)
@@ -54,6 +54,7 @@
* fai-class.1: add ADDCLASS feature, add info about $LOGDIR/additional.var
* package_config/FAIBASE: remove rsh-client, discover
* fai-chboot: ignore ~ and .bak entries
+ * fai-chboot, fai-chboot.8: add option -u
* faimond-gui: add task tests
* tests/Faitest.pm: new file including subroutines for tests. Thanks to
Sebastian Hetze for the initial version.
Modified: trunk/man/fai-chboot.8
===================================================================
--- trunk/man/fai-chboot.8 2009-10-21 13:14:38 UTC (rev 5583)
+++ trunk/man/fai-chboot.8 2009-10-21 14:56:30 UTC (rev 5584)
@@ -1,5 +1,5 @@
.\" Hey, EMACS: -*- nroff -*-
-.TH fai-chboot 8 "17 April 2009" "FAI 3.2"
+.TH fai-chboot 8 "21 October 2009" "FAI 3.3"
.\"
.\" File Name macro. This used to be `.PN', for Path Name,
.\" but Sun doesn't seem to like that very much.
@@ -122,6 +122,9 @@
.BI \-S
Same as \-i but also sets FAI_ACTION=sysinfo.
.TP
+.BI "\-u" URL
+Set FAI_CONFIG_SRC to URL.
+.TP
.B \-v
Create verbose output.
.SH EXAMPLES
@@ -154,6 +157,11 @@
.br
Writing file /srv/tftp/fai/pxelinux.cfg/01020304 for faiserver
.TP
+fai-chboot \-IFv \-u faiserver:/srv/fai/clusterconf node03
+.br
+node03 will be installed using the configuration space
+/srv/fai/clusterconf, which is mounted from faiserver via NFS.
+.TP
fai-chboot memtest86+ atom02
The host atom02 will boot the memory test. Install the package
memtest86+ and copy the executable memtest86+.bin to /srv/tftp/fai
More information about the Fai-commit
mailing list