[Fai-commit] r3863 - in trunk: . bin debian lib man
fai-commit at lists.alioth.debian.org
fai-commit at lists.alioth.debian.org
Tue Sep 5 14:02:51 UTC 2006
Author: lange
Date: 2006-09-05 14:02:51 +0000 (Tue, 05 Sep 2006)
New Revision: 3863
Modified:
trunk/NEWS
trunk/bin/fai-chboot
trunk/debian/changelog
trunk/lib/subroutines-linux
trunk/man/fai-chboot.8
Log:
change fai-chboot options: -D is now -D, -r is now -d, -r unused
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-09-05 13:42:31 UTC (rev 3862)
+++ trunk/NEWS 2006-09-05 14:02:51 UTC (rev 3863)
@@ -38,6 +38,8 @@
- try ftar $FAI/basefiles before extracting base.tgz
- install_packages: new option -p (see man install_packages)
- make-fai-nfsroot: add option -V (see man make-fai-nfsroot)
+ - fai-chboot: change in options, -d is now -D, -r is now -d, -r is
+ not used any more
New in FAI 2.10.5
Modified: trunk/bin/fai-chboot
===================================================================
--- trunk/bin/fai-chboot 2006-09-05 13:42:31 UTC (rev 3862)
+++ trunk/bin/fai-chboot 2006-09-05 14:02:51 UTC (rev 3863)
@@ -28,7 +28,7 @@
#*********************************************************************
# variable needed: $nfsroot
-$version="version 2.2.3 3-august-2006";
+$version="version 3.0 5-sep-2006";
use Socket;
use Net::hostent;
@@ -104,7 +104,7 @@
# create list which entries we want to list
@allfiles = (@default, at enabled, at disabled, at templates, at other);
- $opt_r and @allfiles = @disabled;
+ $opt_d and @allfiles = @disabled;
$opt_e and @allfiles = @enabled;
$opt_t and @allfiles = @templates;
$opt_o and @allfiles = @other;
@@ -336,20 +336,20 @@
}
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-getopts('gBc:d:ehnvlLiIp:f:Frk:Sto');
+getopts('gBc:D:edhnvlLiIp:f:Fk:Sto');
$opt_h and usage;
defined @ARGV or usage;
$opt_n and $opt_v = 1;
$opt_v and $verbose = 1;
-$pxedir = $opt_d || '/srv/tftp/fai/pxelinux.cfg';
+$pxedir = $opt_D || '/srv/tftp/fai/pxelinux.cfg';
$opt_L and $opt_l = 1;
$opt_l and lsdir(@ARGV);
($opt_B and $opt_F) && die "ERROR: use only one option out of -B and -F\n";
($opt_S and $opt_I) && die "ERROR: use only one option out of -I and -S\n";
#TODO: also -e, -r and -c can't be used together
-if ($opt_r) {
+if ($opt_d) {
die "Missing host name(s). Can't disable network booting.\n" unless @ARGV;
foreach (@ARGV) {
disable("$_");
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-09-05 13:42:31 UTC (rev 3862)
+++ trunk/debian/changelog 2006-09-05 14:02:51 UTC (rev 3863)
@@ -1,4 +1,4 @@
-fai (3~beta2) unstable; urgency=low
+fai (3~beta3) unstable; urgency=low
* make pathes conform to FHS : (closes: #340608, #311524, #336650, #309554, #340609)
* use /srv/tftp/fai instead of /boot/fai
@@ -11,7 +11,8 @@
* setup_harddisks: use more secure options for /proc line
* fai-chboot: use tcp as default for nfs, nfs v3 can will become default
with etch, existent .disable pxe file will be removed automatically,
- add headline when copying from template
+ add headline when copying from template, change in options: -d is now
+ -D, -r is now -d, -r is not used any more
* subroutines-linux: task_updatebase does not use updatebase.log any
more (closes: #366823), try ftar $FAI/basefiles before extracting base.tgz
* move /etc/fai/sources.list to /etc/fai/apt/sources.list
@@ -57,7 +58,7 @@
* fai-mirror: use packages.nfsroot instead of packages.arch, check if
obsolete variables are used
- -- Thomas Lange <lange at debian.org> Mon, 4 Sep 2006 16:09:17 +0200
+ -- Thomas Lange <lange at debian.org> Tue, 5 Sep 2006 16:00:46 +0200
fai (2.10.5) unstable; urgency=high
Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux 2006-09-05 13:42:31 UTC (rev 3862)
+++ trunk/lib/subroutines-linux 2006-09-05 14:02:51 UTC (rev 3863)
@@ -264,7 +264,7 @@
echo "WARNING: $frsh failed. Can't call fai-chboot on the install server."
else
# remove pxe config, so host will use default and boot from local disk
- $frsh /usr/sbin/fai-chboot -r $ipaddr
+ $frsh /usr/sbin/fai-chboot -vd $ipaddr
fi
fi
}
Modified: trunk/man/fai-chboot.8
===================================================================
--- trunk/man/fai-chboot.8 2006-09-05 13:42:31 UTC (rev 3862)
+++ trunk/man/fai-chboot.8 2006-09-05 14:02:51 UTC (rev 3863)
@@ -43,7 +43,7 @@
Copy an existing config file to one or more hosts or templates and enable
them for network booting.
.TP
-.BI "\-d " DIR
+.BI "\-D " DIR
Set the default directory for the network boot configuration to
DIR. The default value is /srv/tftp/pxelinux.cfg/.
.TP
@@ -77,7 +77,7 @@
List the configuration for all hosts in short format. If PATTERN is
given, list only hosts matching PATTERN. Lists hostname, FAI_ACTION,
kernel name and IP address in hex. With \fB\-l\fR, list only enabled hosts.
-With \fB-r\fR list only disabled hosts.
+With \fB-d\fR list only disabled hosts.
With \fB-t\fR list only templates.
With \fB-o\fR list only hosts that does not match any of the other categories.
With \fB-g\fR list the configuration for all hosts, sorted and ordered by
@@ -99,7 +99,7 @@
Preserve existing config files. The default is to overwrite an
existing config file.
.TP
-.B \-r
+.B \-d
Disable network booting for HOST. This renames the config file and adds
the suffix .disable to it.
.TP
More information about the Fai-commit
mailing list