* docs/grub.texi (Network): Update instructions on generating netboot

	image.

diff --git a/ChangeLog b/ChangeLog
index 8d7d988b97d6080625a17a52311d9abeb6c0ec34..04ffaecc81aeef575407b0e4908753f2a6718b91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * docs/grub.texi (Network): Update instructions on generating netboot
+       image.
+
 2012-12-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/disk/cryptodisk.c (grub_cmd_cryptomount): Strip brackets

diff --git a/docs/grub.texi b/docs/grub.texi
index b0e7f59de6101fc1fc6f2c7510919aca3b38b758..39d9614383f37e37b069c847d3fc2ff9dac9e999 100644 (file)
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -2080,34 +2080,35 @@ The following properties are supported by all components:
 @node Network
 @chapter Booting GRUB from the network
 
-The following instructions only work on PC BIOS systems where the Preboot
-eXecution Environment (PXE) is available.
+The following instructions don't work for *-emu, i386-qemu, i386-coreboot,
+i386-multiboot, mips_loongson, mips-arc and mips_qemu_mips
 
-To generate a PXE boot image, run:
+To generate a netbootable directory, run:
 
 @example
 @group
-grub-mkimage --format=i386-pc-pxe --output=grub.pxe --prefix='(pxe)/boot/grub' pxe pxecmd
+grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/<platform>
 @end group
 @end example
 
-Copy @file{grub.pxe}, @file{/boot/grub/*.mod}, and @file{/boot/grub/*.lst}
-to the PXE (TFTP) server, ensuring that @file{*.mod} and @file{*.lst} are
-accessible via the @file{/boot/grub/} path from the TFTP server root.  Set
-the DHCP server configuration to offer @file{grub.pxe} as the boot file (the
-@samp{filename} option in ISC dhcpd).
+E.g. for i386-pc:
 
-You can also use the @command{grub-mknetdir} utility to generate an image
-and a GRUB directory tree, rather than copying files around manually.
+@example
+@group
+grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i386-pc
+@end group
+@end example
+
+Then follow instructions printed out by grub-mknetdir on configuring your DHCP
+server.
 
 After GRUB has started, files on the TFTP server will be accessible via the
-@samp{(pxe)} device.
+@samp{(tftp)} device.
 
-The server and gateway IP address can be controlled by changing the
-@samp{(pxe)} device name to @samp{(pxe:@var{server-ip})} or
-@samp{(pxe:@var{server-ip}:@var{gateway-ip})}.  Note that this should be
-changed both in the prefix and in any references to the device name in the
-configuration file.
+The server IP address can be controlled by changing the
+@samp{(tftp)} device name to @samp{(tftp,@var{server-ip})}. Note that
+this should be changed both in the prefix and in any references to the
+device name in the configuration file.
 
 GRUB provides several environment variables which may be used to inspect or
 change the behaviour of the PXE device: