Changeset 4118

Timestamp:

08/04/07 09:21:30 (3 years ago)

Author:

arighi

Message:

This commit is a merge of several commits from trunk -> 3.9.x:

svn merge -r 4113:4117 svn+ssh://arighi@svn.systemimager.org/var/lib/svn/systemimager/trunk .

Original commit message for 4114:
added si_mkautoinstalldisk manpage

Original commit message for 4115:
fixed multiple manpage references

Original commit message for 4116:
removed deprecated command si_mkbootmedia

Original commit message for 4117:
added si_netbootmond manpage

Files:

• branches/3.9.x/Makefile (modified) (1 diff)
• branches/3.9.x/doc/man/Makefile (modified) (2 diffs)
• branches/3.9.x/sbin/si_mkautoinstalldisk (modified) (1 diff)
• branches/3.9.x/sbin/si_mkbootmedia (deleted)
• branches/3.9.x/sbin/si_netbootmond (modified) (1 diff)
• branches/3.9.x/sbin/si_pcp (modified) (1 diff)
• branches/3.9.x/sbin/si_psh (modified) (1 diff)
• branches/3.9.x/sbin/si_pushinstall (modified) (1 diff)
• branches/3.9.x/sbin/si_pushoverrides (modified) (1 diff)
• branches/3.9.x/sbin/si_pushupdate (modified) (1 diff)

branches/3.9.x/Makefile

@@ -167 +167 @@
-KBOOT_CONF_DEST   = $(ETC)/systemimager/kboot.cfg
-
-mkbootmedia si_
+
-SBINARIES := si_addclients si_cpimage si_getimage si_mkdhcpserver si_mkdhcpstatic si_mkautoinstallscript si_mkbootserver si_mvimage si_pushupdate si_pushinstall si_rmimage si_mkrsyncd_conf si_mkclientnetboot si_netbootmond si_mkbootpackage si_monitor si_monitortk si_installbtimage
-CLIENT_SBINARIES  := si_updateclient si_prepareclient

branches/3.9.x/doc/man/Makefile

@@ -41 +41 @@
-                        si_psh.8                        \
-                        si_pushinstall.8                \
-
+
+
+
-
-CLIENT_MAN = si_prepareclient.8 si_updateclient.8
@@ -81 +83 @@
-        pod2man --release=$(SYSTEMIMAGER_VERSION) -s 8 -c "SystemImager" $< $@
-
+si_mkautoinstalldisk.8: $(TOPDIR)/sbin/si_mkautoinstalldisk
+        pod2man --release=$(SYSTEMIMAGER_VERSION) -s 8 -c "SystemImager" $< $@
+
+si_netbootmond.8: $(TOPDIR)/sbin/si_netbootmond
+        pod2man --release=$(SYSTEMIMAGER_VERSION) -s 8 -c "SystemImager" $< $@
+
-%.5 %.8:        %.sgml %.content.sgml
-        docbook2man $<

branches/3.9.x/sbin/si_mkautoinstalldisk

@@ -236 +236 @@
-__END__
-
+=head1 NAME
+
+si_mkautoinstalldisk - generate a bootable disk (typically USB disk) for
+autoinstalling clients
+
+=head1 SYNOPSIS
+
+si_mkautoinstalldisk --device FILE [OPTION] ...
+
+=head1 DESCRIPTION
+
+B<si_mkautoinstalldisk> creates a bootable disk (even a USB disk) that can be
+used to boot one or more autoinstall clients to initiate the auto-installation
+process.
+
+B<si_mkautoinstalldisk> is able to generate an image of the bootable device
+using a regular file. This is pretty useful when you have to play with virtual
+machines that are able to map devices into regular files or to make the cloning
+of the autoinstall disks easier (you can simply create a regular file and use
+dd(1) to perform the raw copy of the file into the real autoinstall devices.
+
+=head1 OPTIONS
+
+=over 8
+ 
+=item B<--help>
+
+Display a short help.
+
+=item B<--version>
+
+Display version and copyright information.
+
+=item B<--quiet>
+
+Run silently and answer yes to all questions.
+
+=item B<--yes>
+
+Answer yes to all questions.
+
+=item B<--device FILE>
+
+Target device that will be used to create the autoinstall device. It can be even
+a regular file.
+
+WARNING: ALL THE DATA IN THE DEVICE WILL BE OVERWRITTEN!!!
+
+=item B<--flavor FLAVOR>
+
+Specify a flavor of boot media (default to "standard").
+See also /usr/share/systemimager/boot/B<arch>/*.
+
+=item B<--arch ARCH>
+
+Create an auto-install disk image for an architecture other than that of this
+host.
+
+=item B<--kernel FILE>
+
+Specify an alternate autoinstall kernel. Default is
+/usr/share/systemimager/boot/B<arch>/B<flavor>/kernel
+
+=item B<--initrd FILE>
+
+Specify an alternate autoinstall initrd.img. Default is
+/usr/share/systemimager/boot/B<arch>/B<flavor>/initrd.img
+
+=item B<--append STRING>
+
+A string of options appended to the autoinstall kernel boot options. For a list
+of all the valid installation parameters see:
+http://wiki.systemimager.org/index.php/Installation_Parameters.
+
+=head1 SEE ALSO
+
+systemimager(8), si_mkautoinstallcd(8), si_mkbootpackage(8), si_prepareclient(8)
+
+=head1 AUTHOR
+
+Andrea Righi <a.righi@cineca.it>.
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright 2003 by Andrea Righi <a.righi@cineca.it>.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+=cut
+

branches/3.9.x/sbin/si_netbootmond

@@ -158 +158 @@
-#
-################################################################################
+
+__END__
+
+=head1 NAME
+
+si_netbootmond - SystemImager's daemon for controlling netboot clients.
+
+=head1 SYNOPSIS
+
+/etc/init.d/systemimager-server-netbootmond start|stop|status|restart
+
+=head1 DESCRIPTION
+
+If clients are configured to always boot from the network, B<si_netbootmond> can
+be configured to tell them to boot off their local disks each time they boot
+after having completed a successful autoinstall.
+
+This allows to always set network booting as default from the BIOS of the
+clients and boot from local disk after a successfull auto-installation.
+
+To enable this feature the parameter B<NET_BOOT_DEFAULT> must be set to B<net>
+in B</etc/systemimager/systemimager.conf> and si_netbootmond must be started via
+the init script B</etc/init.d/systemimager-server-netbootmond>.
+
+To disable this feature set B<NET_BOOT_DEFAULT> to B<local> in
+B</etc/systemimager/systemimager.conf> or just stop B<si_netbootmond> via the
+init script B</etc/init.d/systemimager-server-netbootmond>.
+
+=head1 SEE ALSO
+
+systemimager(8), si_mkclientnetboot(8), /etc/init.d/systemimager-server-netbootmond
+
+=head1 AUTHOR
+
+Brian E. Finley <finley@mcs.anl.gov>.
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright 2002-2003 by Brian E. Finley <finley@mcs.anl.gov>.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+=cut
+

branches/3.9.x/sbin/si_pcp

@@ -214 +214 @@
-=head1 SEE ALSO
-
-perldoc si_psh, perldoc si_pushinstall
+si_psh(8), si_pushinstall(8)
-
-=head1 AUTHOR

branches/3.9.x/sbin/si_psh

@@ -192 +192 @@
-=head1 SEE ALSO
-
-perldoc si_pcp, perldoc si_pushinstall
+si_pcp(8), si_pushinstall(8)
-
-=head1 AUTHOR

branches/3.9.x/sbin/si_pushinstall

@@ -174 +174 @@
-=head1 SEE ALSO
-
-perldoc si_pcp, perldoc si_psh
+si_pcp(8), si_psh(8)
-
-=head1 AUTHOR

branches/3.9.x/sbin/si_pushoverrides

@@ -283 +283 @@
-=head1 SEE ALSO
-
-perldoc si_psh, perldoc si_pcp
+si_psh(8), si_pcp(8)
-
-=head1 AUTHOR

branches/3.9.x/sbin/si_pushupdate

@@ -102 +102 @@
-        print STDERR "error: deprecated use of si_pushupdate!\n";
-        print STDERR "Use \"si_pushinstall\" to perform server-driven installation with SSH transport.\n";
-try: perldoc
+see: man 8
-        exit(1);
-}