Blame SOURCES/0068-docs-grub.texi-Network-Update-instructions-on-genera.patch

f96e0b
From 3db2aa0adc7c356df7baff39b53212c735fff042 Mon Sep 17 00:00:00 2001
f96e0b
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
f96e0b
Date: Mon, 10 Dec 2012 22:22:23 +0100
f96e0b
Subject: [PATCH 068/482] 	* docs/grub.texi (Network): Update
f96e0b
 instructions on generating netboot 	image.
f96e0b
f96e0b
---
f96e0b
 ChangeLog      |  5 +++++
f96e0b
 docs/grub.texi | 35 ++++++++++++++++++-----------------
f96e0b
 2 files changed, 23 insertions(+), 17 deletions(-)
f96e0b
f96e0b
diff --git a/ChangeLog b/ChangeLog
f96e0b
index 8d7d988..04ffaec 100644
f96e0b
--- a/ChangeLog
f96e0b
+++ b/ChangeLog
f96e0b
@@ -1,5 +1,10 @@
f96e0b
 2012-12-10  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
 
f96e0b
+	* docs/grub.texi (Network): Update instructions on generating netboot
f96e0b
+	image.
f96e0b
+
f96e0b
+2012-12-10  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
+
f96e0b
 	* grub-core/disk/cryptodisk.c (grub_cmd_cryptomount): Strip brackets
f96e0b
 	around device name if necessarry.
f96e0b
 
f96e0b
diff --git a/docs/grub.texi b/docs/grub.texi
f96e0b
index b0e7f59..39d9614 100644
f96e0b
--- a/docs/grub.texi
f96e0b
+++ b/docs/grub.texi
f96e0b
@@ -2080,34 +2080,35 @@ The following properties are supported by all components:
f96e0b
 @node Network
f96e0b
 @chapter Booting GRUB from the network
f96e0b
 
f96e0b
-The following instructions only work on PC BIOS systems where the Preboot
f96e0b
-eXecution Environment (PXE) is available.
f96e0b
+The following instructions don't work for *-emu, i386-qemu, i386-coreboot,
f96e0b
+i386-multiboot, mips_loongson, mips-arc and mips_qemu_mips
f96e0b
 
f96e0b
-To generate a PXE boot image, run:
f96e0b
+To generate a netbootable directory, run:
f96e0b
 
f96e0b
 @example
f96e0b
 @group
f96e0b
-grub-mkimage --format=i386-pc-pxe --output=grub.pxe --prefix='(pxe)/boot/grub' pxe pxecmd
f96e0b
+grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/<platform>
f96e0b
 @end group
f96e0b
 @end example
f96e0b
 
f96e0b
-Copy @file{grub.pxe}, @file{/boot/grub/*.mod}, and @file{/boot/grub/*.lst}
f96e0b
-to the PXE (TFTP) server, ensuring that @file{*.mod} and @file{*.lst} are
f96e0b
-accessible via the @file{/boot/grub/} path from the TFTP server root.  Set
f96e0b
-the DHCP server configuration to offer @file{grub.pxe} as the boot file (the
f96e0b
-@samp{filename} option in ISC dhcpd).
f96e0b
+E.g. for i386-pc:
f96e0b
 
f96e0b
-You can also use the @command{grub-mknetdir} utility to generate an image
f96e0b
-and a GRUB directory tree, rather than copying files around manually.
f96e0b
+@example
f96e0b
+@group
f96e0b
+grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i386-pc
f96e0b
+@end group
f96e0b
+@end example
f96e0b
+
f96e0b
+Then follow instructions printed out by grub-mknetdir on configuring your DHCP
f96e0b
+server.
f96e0b
 
f96e0b
 After GRUB has started, files on the TFTP server will be accessible via the
f96e0b
-@samp{(pxe)} device.
f96e0b
+@samp{(tftp)} device.
f96e0b
 
f96e0b
-The server and gateway IP address can be controlled by changing the
f96e0b
-@samp{(pxe)} device name to @samp{(pxe:@var{server-ip})} or
f96e0b
-@samp{(pxe:@var{server-ip}:@var{gateway-ip})}.  Note that this should be
f96e0b
-changed both in the prefix and in any references to the device name in the
f96e0b
-configuration file.
f96e0b
+The server IP address can be controlled by changing the
f96e0b
+@samp{(tftp)} device name to @samp{(tftp,@var{server-ip})}. Note that
f96e0b
+this should be changed both in the prefix and in any references to the
f96e0b
+device name in the configuration file.
f96e0b
 
f96e0b
 GRUB provides several environment variables which may be used to inspect or
f96e0b
 change the behaviour of the PXE device:
f96e0b
-- 
f96e0b
1.8.2.1
f96e0b